outerbounds 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

outerbounds/command_groups/workstations_cli.py

@@ -652,20 +652,38 @@ def prepare_for_ssh_access(
     except Exception as e:
         response["message"] = str(e)
         response["status"] = "FAIL"
-        if output == "json":
-            click.echo(json.dumps(response, indent=4))
-        else:
-            click.secho(f"Failed to prepare for SSH access: {str(e)}", fg="red")
-            click.secho("Error: {}".format(str(e)), fg="red")
 
     if output == "json":
         click.echo(json.dumps(response, indent=4))
     else:
+        colors = {"OK": "green", "FAIL": "red"}
+        message = {"OK": "", "FAIL": f'\nError: {response["message"]}'}
+
         click.secho(
-            f"SSH access prepared successfully: {response['message']}", fg="green"
+            f"SSH access setup status: {response['status']}. {message[response['status']]}",
+            fg=colors[response["status"]],
         )
 
 
+def get_workstation_namespace(workstation_id: str) -> str:
+    profile = ""
+    config_dir = os.getenv("METAFLOW_HOME", os.path.expanduser("~/.metaflowconfig"))
+    metaflow_token = metaflowconfig.get_metaflow_token_from_config(config_dir, profile)
+    api_url = metaflowconfig.get_sanitized_url_from_config(
+        config_dir, profile, "OBP_API_SERVER"
+    )
+    workstations_response = requests.get(
+        f"{api_url}/v1/workstations", headers={"x-api-key": metaflow_token}
+    )
+    workstations_response.raise_for_status()
+
+    for workstation in workstations_response.json()["workstations"]:
+        if workstation["instance_id"] == workstation_id:
+            return workstation["kubernetes_metadata"]["workstation_pod_namespace"]
+
+    raise Exception(f"Workstation {workstation_id} not found")
+
+
 def prepare_for_ssh_access_local(workstation_id):
     """
     SSH connection requires both local instance and workstation pod to do some work.
@@ -677,13 +695,14 @@ def prepare_for_ssh_access_local(workstation_id):
     4. Ensures that the SSH config is setup with the right parameters.
     """
     pod_name = f"{workstation_id}-0"
+    ws_namespace = get_workstation_namespace(workstation_id)
 
     private_key_path, public_key_path = ssh_utils.create_ssh_key_pair()
 
     # Create the .ssh directory if it doesn't exist
     result, stdout, stderr = exec_in_pod(
         pod_name,
-        "ws-69304f8188e31a0745bace40b9378c6b",
+        ws_namespace,
         "mkdir -p /home/ob-workspace/.ssh",
     )
     if result != 0:
@@ -692,7 +711,7 @@ def prepare_for_ssh_access_local(workstation_id):
     # Copy the public key to the workstation
     result, stdout, stderr = cp_to_pod(
         pod_name,
-        "ws-69304f8188e31a0745bace40b9378c6b",
+        ws_namespace,
         public_key_path,
         f"/home/ob-workspace/.ssh/{ssh_utils.EXPECTED_PUBLIC_KEY_NAME}",
     )
@@ -702,7 +721,7 @@ def prepare_for_ssh_access_local(workstation_id):
     # 4. Exec into the pod
     result, stdout, stderr = exec_in_pod(
         pod_name,
-        "ws-69304f8188e31a0745bace40b9378c6b",
+        ws_namespace,
         "outerbounds prepare-for-ssh-access -c remote",
     )
     if result != 0:
@@ -710,7 +729,7 @@ def prepare_for_ssh_access_local(workstation_id):
 
     # 5. Add the entry to the ssh config file
     ok, msg = ssh_utils.add_entry_to_ssh_config(
-        workstation_id, "ws-69304f8188e31a0745bace40b9378c6b", private_key_path
+        workstation_id, ws_namespace, private_key_path
     )
     if not ok:
         raise Exception(f"Failed to add entry to ssh config: {msg}")

{outerbounds-0.8.2.dist-info → outerbounds-0.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.8.2
+Version: 0.8.3
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -30,7 +30,7 @@ Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: metaflow_checkpoint (==0.2.4)
 Requires-Dist: ob-metaflow (==2.17.1.0)
 Requires-Dist: ob-metaflow-extensions (==1.4.8)
-Requires-Dist: ob-metaflow-stubs (==6.0.8.2)
+Requires-Dist: ob-metaflow-stubs (==6.0.8.3)
 Requires-Dist: ob-project-utils (==0.1.35)
 Requires-Dist: opentelemetry-distro (>=0.41b0) ; extra == "otel"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.20.0) ; extra == "otel"

{outerbounds-0.8.2.dist-info → outerbounds-0.8.3.dist-info}/RECORD

@@ -51,7 +51,7 @@ outerbounds/command_groups/local_setup_cli.py,sha256=tuuqJRXQ_guEwOuQSIf9wkUU0yg
 outerbounds/command_groups/perimeters_cli.py,sha256=iF_Uw7ROiSctf6FgoJEy30iDBLVE1j9FKuR3shgJRmc,19050
 outerbounds/command_groups/secrets_cli.py,sha256=Vgn_aiTo76a0s5hCJhNWEOrCVhyYeivD08ooQxz0y7c,2952
 outerbounds/command_groups/tutorials_cli.py,sha256=UInFyiMqtscHFfi8YQwiY_6Sdw9quJOtRu5OukEBccw,3522
-outerbounds/command_groups/workstations_cli.py,sha256=-VFJqIvi_jcHcydaMLj8EaZ-Lbe-yBukkd9QCKrH5f0,27201
+outerbounds/command_groups/workstations_cli.py,sha256=W3OFmInYUfd7Gl3baXIIleZWx6NI3bSeXAqCZ-uvYfA,27901
 outerbounds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/utils/kubeconfig.py,sha256=yvcyRXGR4AhQuqUDqmbGxEOHw5ixMFV0AZIDg1LI_Qo,7981
 outerbounds/utils/kubectl_utils.py,sha256=YxiUVDfXTW7FDpCj639f9upkJNGPf2WuQTjUaBOzX5Q,1926
@@ -60,7 +60,7 @@ outerbounds/utils/schema.py,sha256=lMUr9kNgn9wy-sO_t_Tlxmbt63yLeN4b0xQXbDUDj4A,2
 outerbounds/utils/ssh_utils.py,sha256=MRJ7Oy0M7Lqqs397JDJczTYvxvyHJ_XvBdjt4ZYKaPE,19599
 outerbounds/utils/utils.py,sha256=4Z8cszNob_8kDYCLNTrP-wWads_S_MdL3Uj3ju4mEsk,501
 outerbounds/vendor.py,sha256=gRLRJNXtZBeUpPEog0LOeIsl6GosaFFbCxUvR4bW6IQ,5093
-outerbounds-0.8.2.dist-info/METADATA,sha256=uCslx8xLMGeRt4esHFcTSzBo0rFsVixEIElllfhzIpk,1873
-outerbounds-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-outerbounds-0.8.2.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
-outerbounds-0.8.2.dist-info/RECORD,,
+outerbounds-0.8.3.dist-info/METADATA,sha256=qIJMOGyqaVJ3gdseQAytStZwnAniPyWMiUiuJfrvJNo,1873
+outerbounds-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+outerbounds-0.8.3.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
+outerbounds-0.8.3.dist-info/RECORD,,