Skip to content

Changed Dockerfile and pyproject.toml to fix docker build issues #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterdudfield merged 4 commits into from
Mar 20, 2025
Merged

Changed Dockerfile and pyproject.toml to fix docker build issues #269

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f82101d
Edited the Dockerfile, fixed dependency probs in pyproject.toml
hrsvrn Mar 15, 2025
414cf3b
Merge branch 'openclimatefix:main' into main
hrsvrn Mar 17, 2025
50d0528
Remodified pyproject.toml to keep optional dependencies and Docker fi…
hrsvrn Mar 20, 2025
1411cd5
added newline in pyproject.toml
hrsvrn Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ FROM python:3.11-slim
# Set the working directory in the container
WORKDIR /app

# Copy the requirements.txt file
COPY requirements.txt .

# Install any needed packages specified in requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

# Copy the entire project directory (including quartz_solar_forecast)
COPY . /app

Expand Down
33 changes: 10 additions & 23 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ requires-python = ">=3.6"
license = { text = "MIT" }

dependencies = [
# Keep core dependencies that are needed for the app to run
# Core dependencies
"xarray==2022.12.0",
"pv-site-prediction==0.1.19",
"pydantic==2.6.2",
Expand All @@ -26,7 +26,14 @@ dependencies = [
"uvicorn",
"pydantic_settings",
"httpx",
"sentry_sdk"
"sentry_sdk",
Copy link
Copy Markdown
Contributor

@peterdudfield peterdudfield Mar 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you do this? I think its nice to split the dependencies, then the user can select which requirements they want to install, for example pip install -e .[all] i think installs all of them

Copy link
Copy Markdown
Contributor Author

@hrsvrn hrsvrn Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peterdudfield I've made the modifications to the Docker configuration and updated the pyproject.toml file according to your requirements. I've used the pip installation with the "all" tag since the API requires FastAPI and other dependencies that weren't working with the standard installation.

Lemme know anything else is required!

# Merged optional dependencies
"streamlit",
"plotly",
"huggingface_hub==0.17.3",
"gdown==5.1.0",
"fastapi",
"ocf_vrmapi"
]

[project.urls]
Expand All @@ -36,26 +43,6 @@ dependencies = [
packages = { find = { include = ["*"] } }
package-data = { "quartz_solar_forecast" = ["*"] }

[project.optional-dependencies]
dev = [
"streamlit",
"plotly",
"huggingface_hub==0.17.3",
"gdown==5.1.0",
"fastapi",
]

# additional vendor-specific dependencies for connecting to inverter APIs
inverters = ["ocf_vrmapi"] # victron
all = [
"ocf_vrmapi",
"streamlit",
"plotly",
"huggingface_hub==0.17.3",
"gdown==5.1.0",
"fastapi",
]

[tool.mypy]

[tool.ruff]
Expand All @@ -68,4 +55,4 @@ check-untyped-defs = true
warn-return-any = true
warn-unused-ignores = true
show-error-codes = true
warn-unreachable = true
warn-unreachable = true
Copy link
Copy Markdown
Contributor

@peterdudfield peterdudfield Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you role back this change, i think it needs an extra line at the end of the file

Copy link
Copy Markdown
Contributor Author

@hrsvrn hrsvrn Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Like this?

Copy link
Copy Markdown
Contributor

@peterdudfield peterdudfield Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think so

Copy link
Copy Markdown
Contributor Author

@hrsvrn hrsvrn Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i have fixed it. Please review the changes once more!I believe I've resolved the issue. Would you kindly review the changes once more to confirm?