refactor: supprot for api key names, other fixes

Author: syntaxsdev

appwrite_lab/_orchestrator.py

@@ -9,7 +9,7 @@
 from appwrite_lab.automations.models import BaseVarModel, AppwriteAPIKeyCreation
 from ._state import State
 from dataclasses import dataclass
-from .models import Lab, Automation, SyncType, Project
+from .models import Lab, Automation, Project
 from dotenv import dotenv_values
 from appwrite_lab.utils import console
 from .utils import is_cli
@@ -20,7 +20,7 @@
 @dataclass
 class Response:
     message: str
-    data: any = None
+    data: str | dict | None = None
     error: bool = False
     _print_data: bool = False
 
@@ -275,7 +275,6 @@ def deploy_playwright_automation(
         args: list[str] = [],
         *,
         print_data: bool = False,
-        **kwargs,
     ) -> str | Response:
         """
         Deploy playwright automations on a lab (very few automations supported).

appwrite_lab/cli/new_menu.py

@@ -103,8 +103,8 @@ def new_api_key(
         key = labs.create_api_key(
             project_name=project_name, lab_name=lab_name, expiration=expiration
         )
-        return key
-        # status.update(f"Creating API key for project '{project_name}'... done")
+        status.update(f"Creating API key for project '{project_name}'... done")
+        return key.data
 
 
 @new_menu.command(name="project", help="Create a new project")

appwrite_lab/labs.py

@@ -100,13 +100,14 @@ def sync_with_appwrite_config(
             model=AppwriteSyncProject(sync_type),
             args=addn_args,
         )
+        key_name = f"{proj_name}-key"
         key = self.create_api_key(
-            lab=lab, expiration=expiration, project_name=proj_name
+            lab=lab, expiration=expiration, project_name=proj_name, key_name=key_name
         )
         lab.projects[proj_name] = Project(
             project_id=proj_id,
             project_name=proj_name,
-            api_key=key,
+            api_key=key.data,
         )
         labs = self.state.get("labs")
         labs[name] = lab.to_dict()
@@ -115,6 +116,7 @@ def sync_with_appwrite_config(
     def create_api_key(
         self,
         project_name: str,
+        key_name: str,
         expiration: Expiration = "30 days",
         lab_name: str | None = None,
         lab: Lab | None = None,
@@ -135,7 +137,7 @@ def create_api_key(
             automation=Automation.CREATE_API_KEY,
             model=AppwriteAPIKeyCreation(
                 project_name=project_name,
-                key_name=project_name,
+                key_name=key_name,
                 key_expiry=str(expiration.value),
             ),
             print_data=True,
@@ -144,9 +146,11 @@ def create_api_key(
             return Response(
                 message=f"Failed to create API key: {api_key.message}", error=True
             )
-        # create another Response to print key
-        # return Response(message=api_key.data, data=api_key.data)
-        return api_key
+        return Response(
+            message=f"API key created for {project_name}",
+            data=api_key.data,
+            _print_data=True,
+        )
 
     def stop(self, name: str):
         return self.orchestrator.teardown_service(name)
@@ -177,8 +181,9 @@ def create_project(
             project_name=project_name,
             project_id=project_id,
         )
-        self.orchestrator.deploy_playwright_automation(
+        return self.orchestrator.deploy_playwright_automation(
             lab=lab,
             automation=Automation.CREATE_PROJECT,
+            project=Project(project_id=project_id, project_name=project_name),
             model=apc,
         )

appwrite_lab/models.py

@@ -37,7 +37,7 @@ def to_dict(self):
 class Project(_BaseClass):
     project_id: str
     project_name: str
-    api_key: str
+    api_key: str | None = None
 
 
 @dataclass

tests/test_labs.py

@@ -11,11 +11,35 @@ def test_labs_new(lab: Lab):
     assert lab.url.endswith("8080")
     assert lab.projects.get("default") is not None
 
+
 @pytest.mark.e2e
 def test_labs_create_api_key(lab: Lab, lab_svc: Labs):
     default = lab.projects.get("default")
     res = lab_svc.create_api_key(
         project_name=default.project_name,
+        key_name="default-api-key",
+        expiration=Expiration.THIRTY_DAYS,
+        lab=lab,
+    )
+    assert not res.error
+    assert type(res.data) is str
+    assert res.data.startswith("standard_")
+
+
+@pytest.mark.e2e
+def test_labs_create_project(lab: Lab, lab_svc: Labs):
+    project_name = "test-project"
+    project_id = "test-project-id"
+    res = lab_svc.create_project(
+        project_name=project_name,
+        project_id=project_id,
+        lab=lab,
+    )
+    assert not res.error
+
+    res = lab_svc.create_api_key(
+        project_name=project_name,
+        key_name=project_name,
         expiration=Expiration.THIRTY_DAYS,
         lab=lab,
     )