fix: Allow setting workspace_id on seam client (#131)

* Use from_dict method when returning workspace resource

* Update workspace type

* Allow passing workspace_id to seam client

* Initialize workspace_id unconditionally in the seam client

* Fix assigning api url to workspace id

Author: andrii-balitskyi

seamapi/seam.py

@@ -45,6 +45,7 @@ class Seam(AbstractSeam):
     def __init__(
         self,
         api_key: Optional[str] = None,
+        workspace_id: Optional[str] = None,
         api_url: Optional[str] = None,
         should_report_exceptions: Optional[bool] = False,
     ):
@@ -53,6 +54,8 @@ def __init__(
         ----------
         api_key : str, optional
           API key
+        workspace_id : str, optional
+          Workspace id
         api_url : str, optional
           API url
         should_report_exceptions : bool, optional
@@ -66,9 +69,10 @@ def __init__(
             raise Exception(
                 "SEAM_API_KEY not found in environment, and api_key not provided"
             )
-        if api_url is None:
-            api_url = os.environ.get("SEAM_API_URL", self.api_url)
+        if workspace_id is None:
+            workspace_id = os.environ.get("SEAM_WORKSPACE_ID", None)
         self.api_key = api_key
+        self.workspace_id = workspace_id
         self.api_url = cast(str, api_url)
         self.should_report_exceptions = should_report_exceptions
 
@@ -102,6 +106,8 @@ def make_request(self, method: str, path: str, **kwargs):
             "Content-Type": "application/json",
             "User-Agent": "Python SDK v" + pkg_resources.get_distribution("seamapi").version + " (https://github.com/seamapi/python)",
         }
+        if self.workspace_id is not None:
+            headers["seam-workspace"] = self.workspace_id
         response = requests.request(method, url, headers=headers, **kwargs)
 
         if self.should_report_exceptions and response.status_code:

seamapi/types.py

@@ -152,8 +152,6 @@ class Workspace:
     name: str
     is_sandbox: bool
     connect_partner_name: str = None
-    webview_primary_button_color: str = None
-    webview_logo_shape: str = None
 
 
 @dataclass_json
@@ -797,10 +795,17 @@ def make_request(self, method: str, path: str, **kwargs) -> Any:
 @dataclass
 class AbstractSeam(AbstractRoutes):
     api_key: str
+    workspace_id: str
     api_url: str
 
     @abc.abstractmethod
-    def __init__(self, api_key: Optional[str] = None):
+    def __init__(
+        self,
+        api_key: Optional[str] = None,
+        workspace_id: Optional[str] = None,
+        api_url: Optional[str] = None,
+        should_report_exceptions: Optional[bool] = False,
+    ):
         raise NotImplementedError
 
 

seamapi/workspaces.py

@@ -75,7 +75,7 @@ def list(
             "/workspaces/list",
             params={"workspace_id": workspace_id},
         )
-        return res["workspaces"]
+        return [Workspace.from_dict(w) for w in res['workspaces']]
 
     @report_error
     def get(
@@ -103,11 +103,7 @@ def get(
             "GET",
             "/workspaces/get",
         )
-        return Workspace(
-            workspace_id=res["workspace"]["workspace_id"],
-            name=res["workspace"]["name"],
-            is_sandbox=res["workspace"]["is_sandbox"],
-        )
+        return Workspace.from_dict(res["workspace"])
 
     @report_error
     def reset_sandbox(self) -> None:
@@ -185,11 +181,4 @@ def create(
             "/workspaces/create",
             json=create_payload,
         )
-        return Workspace(
-            workspace_id=res["workspace"]["workspace_id"],
-            name=res["workspace"]["name"],
-            is_sandbox=res["workspace"]["is_sandbox"],
-            connect_partner_name=res["workspace"]["connect_partner_name"],
-            webview_primary_button_color=res["workspace"]["webview_primary_button_color"],
-            webview_logo_shape=res["workspace"]["webview_logo_shape"],
-        )
+        return Workspace.from_dict(res["workspace"])