Skip to content

Improve USE WORKSPACE reliability #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kesmit13 merged 5 commits into from
Nov 5, 2025
Merged

Improve USE WORKSPACE reliability #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b30997
Add debugging
kesmit13 Nov 4, 2025
282f064
Increase USE WORKSPACE timeout
kesmit13 Nov 5, 2025
b7f3a2e
Increase USE WORKSPACE timeout
kesmit13 Nov 5, 2025
9500797
Increase USE WORKSPACE timeout
kesmit13 Nov 5, 2025
f3c8e73
Do not raise exception on timeout
kesmit13 Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 30 additions & 25 deletions singlestoredb/fusion/handlers/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,37 @@ def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:

workspace_id = workspace.id

# Set workspace and database
if params.get('with_database'):
if params.get('in_group'):
# Use 3-element tuple: (workspace_group_id, workspace_name_or_id,
# database)
portal.connection = ( # type: ignore[assignment]
workspace_group.id,
workspace_name or workspace_id,
params['with_database'],
)
else:
# Use 2-element tuple: (workspace_name_or_id, database)
portal.connection = (
workspace_name or workspace_id,
params['with_database'],
)
else:
if params.get('in_group'):
# Use 2-element tuple: (workspace_group_id, workspace_name_or_id)
portal.workspace = ( # type: ignore[assignment]
workspace_group.id,
workspace_name or workspace_id,
)
try:
# Set workspace and database
if params.get('with_database'):
if params.get('in_group'):
# Use 3-element tuple: (workspace_group_id, workspace_name_or_id,
# database)
portal.connection = ( # type: ignore[assignment]
workspace_group.id,
workspace_name or workspace_id,
params['with_database'],
)
else:
# Use 2-element tuple: (workspace_name_or_id, database)
portal.connection = (
workspace_name or workspace_id,
params['with_database'],
)
else:
# Use string: workspace_name_or_id
portal.workspace = workspace_name or workspace_id
if params.get('in_group'):
# Use 2-element tuple: (workspace_group_id, workspace_name_or_id)
portal.workspace = ( # type: ignore[assignment]
workspace_group.id,
workspace_name or workspace_id,
)
else:
# Use string: workspace_name_or_id
portal.workspace = workspace_name or workspace_id

except RuntimeError as exc:
if 'timeout' not in str(exc):
raise

return None

Expand Down
4 changes: 2 additions & 2 deletions singlestoredb/notebook/_portal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def _call_javascript(
args: Optional[List[Any]] = None,
wait_on_condition: Optional[Callable[[], bool]] = None,
timeout_message: str = 'timed out waiting on condition',
wait_interval: float = 0.2,
timeout: float = 5.0,
wait_interval: float = 2.0,
timeout: float = 60.0,
) -> None:
if not has_ipython or not func:
return
Expand Down