Skip to content

Commit

Permalink
started with creating defining classes for RunParams, SchedulerParams…
Browse files Browse the repository at this point in the history
…,...
  • Loading branch information
legout committed Aug 29, 2024
1 parent 9170dc4 commit ad8b98a
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 130 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ wheels/
.vscode
docker/config/.bash_history
docker/assets
dev
dev/simple_with_class
10 changes: 0 additions & 10 deletions dev/scheduler.py

This file was deleted.

40 changes: 0 additions & 40 deletions dev/test_job.py

This file was deleted.

17 changes: 0 additions & 17 deletions dev/worker.py

This file was deleted.

11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ mqtt = ["paho-mqtt>=2.1.0"]
ray = ["ray>=2.34.0"]
redis = ["redis>=5.0.4"]
scheduler = [
"aiosqlite>=0.20.0",
"greenlet>=3.0.3",
"asyncpg>=0.29.0",
"sqlalchemy>=2.0.30",
"apscheduler>=4.0.0a5",
"aiosqlite>=0.20.0",
"greenlet>=3.0.3",
"asyncpg>=0.29.0",
"sqlalchemy>=2.0.30",
"apscheduler @ git+https://github.com/agronholm/apscheduler.git",
]
ui = ["sf-hamilton-ui>=0.0.11"]

Expand All @@ -57,6 +57,7 @@ dev-dependencies = [
"dill>=0.3.8",
"cbor2>=5.6.4",
"lxml>=5.3.0",
"msgspec>=0.18.6",
]
#[tool.rye.scripts]
#flowerpower = {cmd = ["python", "-m", "flowerpower.cli"]}
Expand Down
27 changes: 14 additions & 13 deletions requirements-dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
-e file:.
aiofiles==24.1.0
# via sf-hamilton-ui
aiohappyeyeballs==2.3.7
aiohappyeyeballs==2.4.0
# via aiohttp
aiohttp==3.10.3
aiohttp==3.10.5
# via sf-hamilton-sdk
# via sf-hamilton-ui
aiosignal==1.3.1
Expand All @@ -26,7 +26,7 @@ annotated-types==0.7.0
# via pydantic
anyio==4.4.0
# via apscheduler
apscheduler==4.0.0a5
apscheduler @ git+https://github.com/agronholm/apscheduler.git@8ed2b1babf6c7c173f2c8ed11b9417c891aa0dac
# via flowerpower
asgiref==3.8.1
# via django
Expand Down Expand Up @@ -86,7 +86,7 @@ graphviz==0.20.3
# via sf-hamilton
greenlet==3.0.3
# via flowerpower
idna==3.7
idna==3.8
# via anyio
# via requests
# via yarl
Expand Down Expand Up @@ -116,6 +116,7 @@ monotonic==1.6
# via posthog
msgpack==1.0.8
# via ray
msgspec==0.18.6
multidict==6.0.5
# via aiohttp
# via yarl
Expand All @@ -125,7 +126,7 @@ mypy-extensions==1.0.0
# via typing-inspect
networkx==3.3
# via sf-hamilton
numpy==2.0.1
numpy==2.1.0
# via pandas
# via sf-hamilton
packaging==24.1
Expand All @@ -141,11 +142,11 @@ passlib==1.7.4
pexpect==4.9.0
# via ipython
pillow==10.4.0
posthog==3.5.0
posthog==3.6.0
# via sf-hamilton-sdk
prompt-toolkit==3.0.47
# via ipython
protobuf==5.27.3
protobuf==5.28.0
# via ray
psycopg2-binary==2.9.9
# via sf-hamilton-ui
Expand All @@ -172,7 +173,7 @@ pytz==2024.1
pyyaml==6.0.2
# via flowerpower
# via ray
ray==2.34.0
ray==2.35.0
# via flowerpower
redis==5.0.8
# via flowerpower
Expand All @@ -184,16 +185,16 @@ requests==2.32.3
# via ray
# via sf-hamilton-sdk
# via sf-hamilton-ui
rich==13.7.1
rich==13.8.0
# via flowerpower
# via typer
rpds-py==0.20.0
# via jsonschema
# via referencing
sf-hamilton==1.73.2
sf-hamilton==1.75.0
# via flowerpower
# via sf-hamilton-sdk
sf-hamilton-sdk==0.6.0
sf-hamilton-sdk==0.7.0
# via flowerpower
sf-hamilton-ui==0.0.14
# via flowerpower
Expand All @@ -209,7 +210,7 @@ sniffio==1.3.1
# via anyio
sqlalchemy==2.0.32
# via flowerpower
sqlglot==25.12.0
sqlglot==25.18.0
# via sf-hamilton-sdk
sqlparse==0.5.1
# via django
Expand All @@ -220,7 +221,7 @@ tenacity==8.5.0
traitlets==5.14.3
# via ipython
# via matplotlib-inline
typer==0.12.4
typer==0.12.5
# via flowerpower
# via sf-hamilton-ui
typing-extensions==4.12.2
Expand Down
26 changes: 13 additions & 13 deletions requirements.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
-e file:.
aiofiles==24.1.0
# via sf-hamilton-ui
aiohappyeyeballs==2.3.7
aiohappyeyeballs==2.4.0
# via aiohttp
aiohttp==3.10.3
aiohttp==3.10.5
# via sf-hamilton-sdk
# via sf-hamilton-ui
aiosignal==1.3.1
Expand All @@ -26,7 +26,7 @@ annotated-types==0.7.0
# via pydantic
anyio==4.4.0
# via apscheduler
apscheduler==4.0.0a5
apscheduler @ git+https://github.com/agronholm/apscheduler.git@8ed2b1babf6c7c173f2c8ed11b9417c891aa0dac
# via flowerpower
asgiref==3.8.1
# via django
Expand Down Expand Up @@ -78,7 +78,7 @@ graphviz==0.20.3
# via sf-hamilton
greenlet==3.0.3
# via flowerpower
idna==3.7
idna==3.8
# via anyio
# via requests
# via yarl
Expand Down Expand Up @@ -110,7 +110,7 @@ mypy-extensions==1.0.0
# via typing-inspect
networkx==3.3
# via sf-hamilton
numpy==2.0.1
numpy==2.1.0
# via pandas
# via sf-hamilton
packaging==24.1
Expand All @@ -121,9 +121,9 @@ pandas==2.2.2
# via sf-hamilton
passlib==1.7.4
# via sf-hamilton-ui
posthog==3.5.0
posthog==3.6.0
# via sf-hamilton-sdk
protobuf==5.27.3
protobuf==5.28.0
# via ray
psycopg2-binary==2.9.9
# via sf-hamilton-ui
Expand All @@ -145,7 +145,7 @@ pytz==2024.1
pyyaml==6.0.2
# via flowerpower
# via ray
ray==2.34.0
ray==2.35.0
# via flowerpower
redis==5.0.8
# via flowerpower
Expand All @@ -157,16 +157,16 @@ requests==2.32.3
# via ray
# via sf-hamilton-sdk
# via sf-hamilton-ui
rich==13.7.1
rich==13.8.0
# via flowerpower
# via typer
rpds-py==0.20.0
# via jsonschema
# via referencing
sf-hamilton==1.73.2
sf-hamilton==1.75.0
# via flowerpower
# via sf-hamilton-sdk
sf-hamilton-sdk==0.6.0
sf-hamilton-sdk==0.7.0
# via flowerpower
sf-hamilton-ui==0.0.14
# via flowerpower
Expand All @@ -181,13 +181,13 @@ sniffio==1.3.1
# via anyio
sqlalchemy==2.0.32
# via flowerpower
sqlglot==25.12.0
sqlglot==25.18.0
# via sf-hamilton-sdk
sqlparse==0.5.1
# via django
tenacity==8.5.0
# via apscheduler
typer==0.12.4
typer==0.12.5
# via flowerpower
# via sf-hamilton-ui
typing-extensions==4.12.2
Expand Down
4 changes: 2 additions & 2 deletions src/flowerpower/cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

from .helpers.templates import (
PIPELINE_TEMPLATE, # noqa: F401
SCHEDULER_TEMPLATE,
TRACKER_TEMPLATE,
SCHEDULER_TEMPLATE, # noqa: F401
TRACKER_TEMPLATE, # noqa: F401
)


Expand Down
Loading

0 comments on commit ad8b98a

Please sign in to comment.