Skip to content

Commit 46700b9

Browse files
committed
Update version to 0.9.6.2; modify .gitignore, enhance PipelineManager adapter handling, and adjust example configurations
1 parent c9d2e34 commit 46700b9

File tree

7 files changed

+138
-31
lines changed

7 files changed

+138
-31
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ test/test2.json
2222
.qodo/history.sqlite
2323
examples/hello-world3/
2424
examples/hello-world2/
25-
examples/hello-world4/
25+
examples/hello-world4/
26+
~/.hamilton/db/db.sqlite3

docker/docker-compose.yml

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,41 +79,61 @@ services:
7979
- 5432:5432
8080

8181
backend:
82-
container_name: ui-backend
82+
container_name: hamilton-ui-backend
8383
image: dagworks/ui-backend:latest
84+
#build:
85+
# context: backend
86+
# dockerfile: Dockerfile.backend
87+
entrypoint: [ "/bin/bash", "-c", "cd /code/server && ls && ./entrypoint.sh" ]
88+
volumes:
89+
#- ./backend:/code
90+
- /data/hamilton_ui:/data/
8491
ports:
85-
- "8241:8241"
92+
- 8241:8241
93+
#env_file: .env
8694
environment:
87-
- DB_HOST=db
95+
- DB_HOST=postgres
8896
- DB_PORT=5432
89-
- DB_NAME=postgres
90-
- DB_USER=user
91-
- DB_PASSWORD=password # TODO: Change this to a secret
97+
- DB_NAME=flowerpower
98+
- DB_USER=postgres
99+
- DB_PASSWORD=password # Purely for local! Do not deploy to production!
92100
- HAMILTON_BLOB_STORE=local
93101
- HAMILTON_ENV=local # local env
94102
- HAMILTON_LOCAL_BLOB_DIR=/data/blobs # TODO -- set this up to be a better one
95103
- DJANGO_SECRET_KEY=do_not_use_in_production
96-
- HAMILTON_TELEMETRY_ENABLED=${HAMILTON_TELEMETRY_ENABLED-true}
104+
- HAMILTON_TELEMETRY_ENABLED=false #${HAMILTON_TELEMETRY_ENABLED}
97105
- HAMILTON_AUTH_MODE=permissive
98-
depends_on:
99-
- postgres
100-
volumes:
101-
- backend_data:/data/
106+
- HAMILTON_ALLOWED_HOSTS=*
107+
- HAMILTON_CAPTURE_DATA_STATISTICS=false
108+
- HAMILTON_MAX_LIST_LENGTH_CAPTURE
109+
- HAMILTON_MAX_DICT_LENGTH_CAPTURE
110+
111+
restart: unless-stopped
102112

103113
frontend:
104-
container_name: ui-frontend
114+
container_name: hamilton-ui-frontend
105115
image: dagworks/ui-frontend:latest
116+
#build:
117+
# context: frontend
118+
# dockerfile: Dockerfile.frontend
119+
# args:
120+
# - REACT_APP_AUTH_MODE=local
121+
# - REACT_APP_USE_POSTHOG=false
122+
#volumes:
123+
# - ./frontend:/usr/src/app
124+
# - /usr/src/app/node_modules
106125
ports:
107-
- "8242:8242"
126+
- 8242:8242
108127
environment:
109-
- NGINX_PORT=8242 # NB Custom port won't be visible in console & will mean the backend's shortcut will fail
128+
- NGINX_PORT=8242
110129
- NODE_ENV=development
111130
- REACT_APP_AUTH_MODE=local
112131
- REACT_APP_USE_POSTHOG=false
113132
- REACT_APP_API_URL=http://backend:8241
114133
depends_on:
115134
- backend
116135

136+
restart: unless-stopped
117137

118138
volumes:
119139
jupytercode:

examples/hello-world/conf/pipelines/hello_world.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ run:
77
config: {}
88
executor: null
99
final_vars:
10-
- spend
11-
- signups
12-
- avg_x_wk_spend
13-
- spend_per_signup
14-
- spend_zero_mean_unit_variance
10+
- spend
11+
- signups
12+
- avg_x_wk_spend
13+
- spend_per_signup
14+
- spend_zero_mean_unit_variance
1515
inputs: {}
1616
with_opentelemetry: false
17-
with_tracker: false
17+
with_tracker: true
1818
schedule:
1919
run:
2020
coalesce: latest
@@ -38,7 +38,7 @@ schedule:
3838
weeks: null
3939
years: null
4040
cron:
41-
crontab: '* * * * *'
41+
crontab: "* * * * *"
4242
day: null
4343
day_of_week: null
4444
end_time: null
@@ -63,7 +63,6 @@ schedule:
6363
weeks: null
6464
type_: cron
6565
tracker:
66-
dag_name: null
67-
project_id: null
66+
dag_name: test
67+
project_id: 2
6868
tags: {}
69-
version: null

examples/hello-world/conf/project.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open_telemetry:
55
tracker:
66
api_key: null
77
api_url: http://localhost:8241
8-
ui_url: http://localhost:8242
9-
username: null
8+
ui_url: https://localhost:8242
9+
1010
worker:
1111
cleanup_interval: 900
1212
data_store:
1313
type: sqlalchemy
14-
uri: sqlite+aiosqlite:///flowerpower.db
14+
uri: sqlite+aiosqlite:///examples/hello-world/flowerpower.db
1515
#uri: postgresql+asyncpg://postgres:password@localhost/flowerpower
1616
event_broker:
1717
type: redis

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "A simple workflow framework. Hamilton + APScheduler = FlowerPower
44
authors = [{name = "Volker L.", email = "[email protected]"}]
55
readme = "README.md"
66
requires-python = ">= 3.11"
7-
version = "0.9.6.1"
7+
version = "0.9.6.2"
88
keywords = [
99
"hamilton",
1010
"workflow",
@@ -117,5 +117,6 @@ dev-dependencies = [
117117
"marimo>=0.10.19",
118118
"panel>=1.6.0",
119119
"ipywidgets>=8.1.5",
120+
"scikit-learn>=1.6.1",
120121
]
121122
package = true

src/flowerpower/pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def _get_driver(
241241
driver.Builder()
242242
.with_modules(self._module)
243243
.enable_dynamic_execution(allow_experimental_mode=True)
244-
.with_adapters(adapters)
244+
.with_adapters(*adapters)
245245
.with_remote_executor(executor_)
246246
.with_config(config)
247247
.build()

0 commit comments

Comments
 (0)