Merge branch 'main' into feat--functions

Author: mrkaye97

.github/workflows/e2e.yaml

@@ -28,7 +28,7 @@ jobs:
           virtualenvs-create: true
           virtualenvs-in-project: true
       - name: Install dependencies
-        run: poetry install --no-interaction
+        run: poetry install --no-interaction --all-extras
 
       - name: Generate Env File
         run: |

.github/workflows/lint.yaml

@@ -26,7 +26,7 @@ jobs:
           virtualenvs-in-project: true
 
       - name: Install linting tools
-        run: poetry install
+        run: poetry install --all-extras
 
       - name: Run Black
         run: poetry run black . --check --verbose --diff --color

conftest.py

@@ -10,17 +10,58 @@
 import pytest
 import pytest_asyncio
 
-from hatchet_sdk import Hatchet
+from hatchet_sdk import ClientConfig, Hatchet
+from hatchet_sdk.loader import ClientTLSConfig
+
+
+@pytest.fixture(scope="session", autouse=True)
+def token() -> str:
+    result = subprocess.run(
+        [
+            "docker",
+            "compose",
+            "run",
+            "--no-deps",
+            "setup-config",
+            "/hatchet/hatchet-admin",
+            "token",
+            "create",
+            "--config",
+            "/hatchet/config",
+            "--tenant-id",
+            "707d0855-80ab-4e1f-a156-f1c4546cbf52",
+        ],
+        capture_output=True,
+        text=True,
+    )
+
+    token = result.stdout.strip()
+
+    os.environ["HATCHET_CLIENT_TOKEN"] = token
+
+    return token
 
 
 @pytest_asyncio.fixture(scope="session")
-async def aiohatchet() -> AsyncGenerator[Hatchet, None]:
-    yield Hatchet(debug=True)
+async def aiohatchet(token: str) -> AsyncGenerator[Hatchet, None]:
+    yield Hatchet(
+        debug=True,
+        config=ClientConfig(
+            token=token,
+            tls_config=ClientTLSConfig(strategy="none"),
+        ),
+    )
 
 
 @pytest.fixture(scope="session")
-def hatchet() -> Hatchet:
-    return Hatchet(debug=True)
+def hatchet(token: str) -> Hatchet:
+    return Hatchet(
+        debug=True,
+        config=ClientConfig(
+            token=token,
+            tls_config=ClientTLSConfig(strategy="none"),
+        ),
+    )
 
 
 @pytest.fixture()
@@ -32,7 +73,10 @@ def worker(
     command = ["poetry", "run", example]
 
     logging.info(f"Starting background worker: {' '.join(command)}")
-    proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    proc = subprocess.Popen(
+        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ.copy()
+    )
 
     # Check if the process is still running
     if proc.poll() is not None:

examples/affinity-workers/event.py

@@ -1,10 +1,6 @@
-from dotenv import load_dotenv
-
 from hatchet_sdk.clients.events import PushEventOptions
 from hatchet_sdk.hatchet import Hatchet
 
-load_dotenv()
-
 hatchet = Hatchet(debug=True)
 
 hatchet.event.push(

examples/affinity-workers/worker.py

@@ -1,15 +1,14 @@
-from dotenv import load_dotenv
-
-from hatchet_sdk import Context, Hatchet, WorkerLabelComparator
+from hatchet_sdk import BaseWorkflow, Context, Hatchet, WorkerLabelComparator
 from hatchet_sdk.labels import DesiredWorkerLabel
 
-load_dotenv()
-
 hatchet = Hatchet(debug=True)
 
+wf = hatchet.declare_workflow(on_events=["affinity:run"])
+
+
+class AffinityWorkflow(BaseWorkflow):
+    config = wf.config
 
-@hatchet.workflow(on_events=["affinity:run"])
-class AffinityWorkflow:
     @hatchet.step(
         desired_worker_labels={
             "model": DesiredWorkerLabel(value="fancy-ai-model-v2", weight=10),

examples/api/api.py

@@ -1,8 +1,4 @@
-from dotenv import load_dotenv
-
-from hatchet_sdk import Hatchet, WorkflowList
-
-load_dotenv()
+from hatchet_sdk import Hatchet
 
 hatchet = Hatchet(debug=True)
 

examples/api/async_api.py

@@ -1,17 +1,12 @@
 import asyncio
-from typing import cast
 
-from dotenv import load_dotenv
-
-from hatchet_sdk import Hatchet, WorkflowList
-
-load_dotenv()
+from hatchet_sdk import Hatchet
 
 hatchet = Hatchet(debug=True)
 
 
 async def main() -> None:
-    workflow_list = await hatchet.rest.aio.workflow_list()
+    workflow_list = await hatchet.rest.aio_list_workflows()
     rows = workflow_list.rows or []
 
     for workflow in rows:

examples/api/test_api.py

@@ -17,6 +17,6 @@ async def test_list_workflows(hatchet: Hatchet, worker: Worker) -> None:
 @pytest.mark.parametrize("worker", ["concurrency_limit_rr"], indirect=True)
 @pytest.mark.asyncio(scope="session")
 async def test_async_list_workflows(aiohatchet: Hatchet, worker: Worker) -> None:
-    workflows = await aiohatchet.rest.aio.workflow_list()
+    workflows = await aiohatchet.rest.aio_list_workflows()
 
     assert len(workflows.rows or []) != 0