fix:small tweaks

grutt · grutt · commit 877153238b5f · 2024-03-08T09:50:17.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -122,14 +122,16 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+.env*
 .venv
 env/
 venv/
 ENV/
 env.bak/
 venv.bak/
 
+**/*.pem
+
 # Spyder project settings
 .spyderproject
 .spyproject
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -93,11 +93,15 @@ services:
         condition: service_completed_successfully
       migration:
         condition: service_completed_successfully
+    env_file:
+      - .env.server
     environment:
+      SERVER_GRPC_BROADCAST_ADDRESS: hatchet-engine:7070
       DATABASE_URL: "postgres://hatchet:hatchet@postgres:5432/hatchet"
     volumes:
       - hatchet_certs:/hatchet/certs
       - hatchet_config:/hatchet/config
+      - ./github.pem:/hatchet/github/github.pem # This line mounts your optional github pem
   hatchet-frontend:
     image: ghcr.io/hatchet-dev/hatchet/hatchet-frontend:latest
   caddy:
diff --git a/fast-api-react/backend/src/api/main.py b/fast-api-react/backend/src/api/main.py
@@ -17,14 +17,14 @@
 
 
 origins = [
-    "http://localhost:3000",
-    "localhost:3000"
+    "http://localhost:3001",
+    "localhost:3001"
 ]
 
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=origins,
+    allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"]
diff --git a/fast-api-react/backend/src/workflows/basicrag.py b/fast-api-react/backend/src/workflows/basicrag.py
@@ -12,10 +12,8 @@ class BasicRagWorkflow:
 
     @hatchet.step()
     def start(self, context: Context):
-        override = context.playground('model', "gpt-3.5-turbo")
-
         return {
-            "status": "reading hatchet docs" + override,
+            "status": "reading hatchet docs",
         }
 
     @hatchet.step(parents=["start"])
diff --git a/fast-api-react/backend/src/workflows/main.py b/fast-api-react/backend/src/workflows/main.py
@@ -1,12 +1,8 @@
 from .hatchet import hatchet
 from .basicrag import BasicRagWorkflow
-from .simple import SimpleWorkflow
 
 
 def start():
-    worker = hatchet.worker('example-worker')
-
+    worker = hatchet.worker('basic-rag-worker')
     worker.register_workflow(BasicRagWorkflow())
-    worker.register_workflow(SimpleWorkflow())
-
     worker.start()
diff --git a/fast-api-react/backend/src/workflows/simple.py b/fast-api-react/backend/src/workflows/simple.py
diff --git a/simple-examples/poetry.lock b/simple-examples/poetry.lock
diff --git a/simple-examples/pyproject.toml b/simple-examples/pyproject.toml
@@ -14,8 +14,7 @@ python-dotenv = "^1.0.0"
 openai = "^1.12.0"
 beautifulsoup4 = "^4.12.3"
 requests = "^2.31.0"
-urllib3 = "1.26.15"
-hatchet-sdk = "0.10.5"
+hatchet-sdk = "^0.15.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/simple-examples/src/concurrency_limit/event_test.py b/simple-examples/src/concurrency_limit/event_test.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 hatchet.client.event.push(
     "concurrency-test",
diff --git a/simple-examples/src/concurrency_limit/worker.py b/simple-examples/src/concurrency_limit/worker.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 @hatchet.workflow(on_events=["concurrency-test"])
diff --git a/simple-examples/src/dag/event_test.py b/simple-examples/src/dag/event_test.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 hatchet.client.event.push(
diff --git a/simple-examples/src/dag/worker.py b/simple-examples/src/dag/worker.py
@@ -1,5 +1,5 @@
 from hatchet_sdk import Context
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 @hatchet.workflow(on_events=["user:create"])
diff --git a/simple-examples/src/genai/basicrag.py b/simple-examples/src/genai/basicrag.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 from hatchet_sdk import Context
 from bs4 import BeautifulSoup
 from openai import OpenAI
diff --git a/simple-examples/src/genai/simple.py b/simple-examples/src/genai/simple.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 from hatchet_sdk import Context
 import openai
 
diff --git a/simple-examples/src/manual_trigger/trigger-on.py b/simple-examples/src/manual_trigger/trigger-on.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 workflowRunId = hatchet.client.admin.run_workflow("ManualTriggerWorkflow", {
     "test": "test"
diff --git a/simple-examples/src/manual_trigger/worker.py b/simple-examples/src/manual_trigger/worker.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 @hatchet.workflow(on_events=["man:create"])
diff --git a/simple-examples/src/simple/event_test.py b/simple-examples/src/simple/event_test.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 hatchet.client.event.push(
     "simple:create",
diff --git a/simple-examples/src/simple/worker.py b/simple-examples/src/simple/worker.py
@@ -1,19 +1,14 @@
 from hatchet_sdk import Context
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 @hatchet.workflow(on_events=["simple:create"])
-class SimpleWorkflow:
+class SimpleWorkflowG:
 
     @hatchet.step()
     def step1(self, context: Context):
-        test = context.playground("test", "test")
-        test2 = context.playground("test2", 100)
-        test3 = context.playground("test3", None)
-
-        print(test)
-        print(test2)
-
+        print(context.workflow_input())
+        context.log('hello world')
         print("executed step1")
         pass
 
@@ -22,3 +17,8 @@ def step2(self, context):
         print("started step2")
         context.sleep(1)
         print("finished step2")
+
+
+worker = hatchet.worker("example-worker-g")
+worker.register_workflow(SimpleWorkflowG())
+worker.start()
diff --git a/simple-examples/src/timeout/event_test.py b/simple-examples/src/timeout/event_test.py
@@ -1,4 +1,4 @@
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 hatchet.client.event.push(
     "timeout:create",
diff --git a/simple-examples/src/timeout/worker.py b/simple-examples/src/timeout/worker.py
@@ -1,5 +1,5 @@
 from hatchet_sdk import Context
-from ..hatchet import hatchet
+from src.hatchet import hatchet
 
 
 @hatchet.workflow(on_events=["timeout:create"])

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ..hatchet import hatchet`
	`1`	`+from src.hatchet import hatchet`
`2`	`2`
`3`	`3`	`hatchet.client.event.push(`
`4`	`4`	`"concurrency-test",`