Streamlined the project structure

Author: dimtics

.dockerignore

@@ -12,35 +12,16 @@ dependencies = [
     "asyncio>=3.4.3",
     "duckdb>=1.1.3",
     "httpx>=0.27.2",
-    "pandas>=2.2.3",
     "plotly>=5.24.1",
     "polars>=1.12.0",
-    "pydantic>=2.9.2",
-    "python-dotenv>=1.0.1",
-    "pyyaml>=6.0.2",
+    "pydantic-settings>=2.8.1",
     "streamlit>=1.40.1",
 ]
 
-[tool.hatch.build.targets.wheel]
-packages = ["src/stock_valuation_app"]
-
-[project.scripts]
-stock-valuation-app = "stock_valuation_app:main"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
 [dependency-groups]
 dev = [
     "ipykernel>=6.29.5",
     "mypy>=1.13.0",
     "pytest>=8.3.3",
     "ruff>=0.7.3",
-]
-
-[tool.pytest.ini.options]
-pythonpath = "src/stock_valuation_app"
-
-# [tool.setuptools]
-# package-dir = {"" = "src"}
+]

Dockerfile

@@ -1,33 +1,20 @@
-import os
 import asyncio
 from dataclasses import dataclass, field
 from typing import Any
-import httpx
-import stock_valuation_app.utils as utils
-from stock_valuation_app.models.stock_models import CombinedModel
-
-
-def get_endpoint(url: str) -> str:
-    """Get endpoints from the configuration."""
-    api_config = utils.get_section_config("api")
-    return api_config.get(f"{url}")
-
-
-def get_base_url() -> str:
-    """Get the base URL from the configuration."""
-    return get_endpoint("base_url")
 
+import httpx
 
-def get_api_key() -> str:
-    """Get the API key from the .env file."""
-    return os.getenv("FMP_API_KEY", "")
+import utils as utils
+from config import settings
+from models.stock_models import CombinedModel
 
 
 @dataclass
 class FMPClient:
     """A client for interacting with the Financial Modeling Prep API."""
-    base_url: str = field(default_factory=get_base_url)
-    api_key: str = field(default_factory=get_api_key)
+
+    base_url: str = field(default_factory=settings.base_url)
+    api_key: str = field(default_factory=settings.fmp_api_key)
     metric_types: list[str] = field(
         default_factory=lambda: [
             "profile",
@@ -67,11 +54,14 @@ async def fetch_data(self, ticker: str) -> dict[str, list[dict[str, Any]]]:
                 "rating": "ratings",
                 "key-metrics": "key_metrics",
                 "key-metrics-ttm": "key_metrics_ttm",
-                "financial-growth": "growth",}  #
-            new_metric_types = [replace_metric_types.get(item, item) for item in self.metric_types]
+                "financial-growth": "growth",
+            }  #
+            new_metric_types = [
+                replace_metric_types.get(item, item) for item in self.metric_types
+            ]
 
             # Create combined records dict for validation
             records = dict(zip(new_metric_types, results))
 
             # Validate the combined records
-            return CombinedModel(**records).model_dump()
+            return CombinedModel(**records).model_dump()