feat: support for any port init test

Author: syntaxsdev

appwrite_lab/_orchestrator.py

@@ -1,4 +1,5 @@
 import os
+import re
 import shutil
 import subprocess
 import json
@@ -11,8 +12,8 @@
 from .models import LabService, Automation, SyncType
 from dotenv import dotenv_values
 from appwrite_lab.utils import console
-from .utils import is_cli, load_config
-from .config import APPWRITE_CLI_IMAGE, APPWRITE_PLAYWRIGHT_IMAGE
+from .utils import is_cli
+from .config import APPWRITE_PLAYWRIGHT_IMAGE
 from dataclasses import asdict
 
 
@@ -204,10 +205,15 @@ def deploy_appwrite_lab(
 
         # Get appwrite pods
         project_pods = self.get_running_pods_by_project(name)
-        if "appwrite" in project_pods:
-            appwrite_pod = project_pods["appwrite"]
-            port = appwrite_pod["Ports"].split("/")[0]
+        if traefik_pod := project_pods.get("appwrite-traefik", None):
+            ports = traefik_pod["Ports"].split(",")
+            port = extract_port_from_pod_info(traefik_pod)
+            assert len(ports) > 1, OrchestratorError(
+                "Failed to extract port from pod info."
+            )
+            port = extract_port_from_pod_info(traefik_pod)
             url = f"http://localhost:{port}"
+            print("url", url)
         else:
             url = ""
         lab = LabService(
@@ -223,9 +229,8 @@ def deploy_appwrite_lab(
             lab, Automation.CREATE_USER_AND_API_KEY
         )
         if type(api_key_res) is Response and api_key_res.error:
-            api_key_res.message = (
-                f"Lab '{name}' deployed, but failed to create API key."
-            )
+            api_key_res.message = f"Lab '{name}' deployed, but failed to create API key. Spinning down lab."
+            self.teardown_service(name)
             return api_key_res
         lab.api_key = api_key_res.data
 
@@ -292,7 +297,7 @@ def deploy_playwright_automation(
                 "run",
                 "--network",
                 "host",
-                # "--rm",
+                "--rm",
                 "-u",
                 f"{os.getuid()}:{os.getgid()}",
                 "-v",
@@ -458,3 +463,18 @@ def get_env_vars(name: str):
     Get the default environment variables.
     """
     return dotenv_values(name)
+
+
+def extract_port_from_pod_info(pod_info: dict) -> int:
+    """Extract port from pod information returned by get_running_pods_by_project.
+
+    Args:
+        pod_info: The pod information to extract the port from.
+    """
+    if "Ports" in pod_info:
+        # Handle format like "0.0.0.0:8005->80/tcp"
+        ports_str = pod_info["Ports"]
+        match = re.search(r":(\d+)->80/tcp", ports_str)
+        if match:
+            return int(match.group(1))
+    raise OrchestratorError(f"Failed to extract port from pod info: {pod_info}")

appwrite_lab/labs.py

@@ -1,7 +1,7 @@
 from appwrite_lab.utils import load_config
 from ._state import State
 from ._orchestrator import ServiceOrchestrator, Response
-from .models import Automation
+from .models import Automation, LabService
 from appwrite_lab.automations.models import AppwriteProjectCreation, AppwriteSyncProject
 
 from pathlib import Path
@@ -25,12 +25,21 @@ def new(
         Deploy a new Appwrite lab.
 
         Args:
-            name (str): The name of the lab.
-            version (str): The version of the lab.
-            port (int): The port of the lab.
+            name: The name of the lab.
+            version: The version of the lab.
+            port: The port of the lab.
         """
         return self.orchestrator.deploy_appwrite_lab(name, version, port, meta)
 
+    def get_lab(self, name: str) -> LabService | None:
+        """
+        Get a lab by name.
+
+        Args:
+            name: The name of the lab.
+        """
+        return self.orchestrator.get_lab(name)
+
     def sync_with_appwrite_config(
         self, name: str, appwrite_json: str, sync_type: str = "all"
     ):

appwrite_lab/models.py

@@ -8,14 +8,13 @@ class Automation(StrEnum):
     CREATE_USER_AND_API_KEY = "create_user_and_api_key"
     CREATE_API_KEY = "create_api_key"
     SYNC_PROJECT = "sync_project"
-    CREATE_USER = "create_user"
+    # CREATE_USER = "create_user"
     CREATE_PROJECT = "create_project"
-    CREATE_DATABASE = "create_database"
-    CREATE_COLLECTION = "create_collection"
-    CREATE_DOCUMENT = "create_document"
-    CREATE_FUNCTION = "create_function"
-    # CREATE_TRIGGER = "create_trigger"
-    CREATE_ROLE = "create_role"
+    # CREATE_DATABASE = "create_database"
+    # CREATE_COLLECTION = "create_collection"
+    # CREATE_DOCUMENT = "create_document"
+    # CREATE_FUNCTION = "create_function"
+    # CREATE_ROLE = "create_role"
 
 
 class SyncType(StrEnum):

pyproject.toml

@@ -13,6 +13,10 @@ license = "MIT"
 
 [tool.setuptools]
 packages = { find = { where = ["."] } }
+include-package-data = true
+
+[tool.setuptools.package-data]
+appwrite_lab = ["templates/**/*"]
 
 [project.scripts]
 appwrite-lab = "appwrite_lab.cli.entry:app"

tests/conftest.py

@@ -0,0 +1,17 @@
+import pytest
+from appwrite_lab.labs import Labs
+
+
+@pytest.fixture(scope="session")
+def lab_svc():
+    return Labs()
+
+
+@pytest.fixture(scope="session")
+def lab(lab_svc: Labs):
+    res = lab_svc.new(name="pytest-lab", version="1.7.4", port=8005)
+    if not res.error:
+        yield lab_svc.get_lab("pytest-lab")
+        lab_svc.stop("pytest-lab")
+    else:
+        raise ValueError(res.message)

tests/test_labs.py

@@ -0,0 +1,5 @@
+from appwrite_lab.models import LabService
+
+
+def test_labs_new(lab: LabService):
+    assert lab.name == "pytest-lab"