datamarket 0.9.19__py3-none-any.whl → 0.9.20__py3-none-any.whl

datamarket/utils/main.py

@@ -2,8 +2,6 @@
 # IMPORTS
 
 import asyncio
-from dataclasses import dataclass
-import inspect
 import logging
 import random
 import re
@@ -12,26 +10,25 @@ import shutil
 import subprocess
 import time
 from pathlib import Path
-from typing import Literal, Optional, Union
+from typing import Any, Literal, Self, Union
 
 import pendulum
 from croniter import croniter
-from configparser import RawConfigParser
 from dynaconf import Dynaconf, add_converter
 
 logger = logging.getLogger(__name__)
 
-########################################################################################################################
-# CLASSES
+
+class NoProjectFoundError(Exception):
+    def __init__(self):
+        super().__init__("Could not detect project. Did you add the config file?")
 
 
-@dataclass
-class ProjectMetadata:
-    cmd_prefix: str
-    package_name: str
-    env_name: str
-    path: Path
-    config_path: Path
+class NoPackageFoundError(Exception):
+    def __init__(self):
+        super().__init__(
+            "A project was detected but it has no packages inside the 'src' directory"
+        )
 
 
 ########################################################################################################################
@@ -79,62 +76,80 @@ def read_converter(path_str: str):
         return f.read()
 
 
-def get_config(
-    config_file: Optional[Path] = None, tz: str = "Europe/Madrid"
-) -> Dynaconf:
-    config_file = config_file or get_project_metadata().config_path
-
-    if Path(config_file).suffix == ".ini":
-        logger.warning("Using legacy INI config reader. Please migrate to TOML")
-        cfg = RawConfigParser()
-        cfg.read(config_file)
-        return cfg
-
-    add_converter("read", read_converter)
-
-    dt_now = get_granular_date("now", tz)
-    dt_weekly = get_granular_date("weekly", tz)
-    dt_biweekly = get_granular_date("biweekly", tz)
-
-    config = Dynaconf(
-        environments=True,
-        env_switcher="SYSTYPE",
-    )
-
-    config.load_file(path=config_file)
-    config.load_file(path=Path.home() / config_file.name)
-
-    config.vars = {
-        "year": dt_now.strftime("%Y"),
-        "month": dt_now.strftime("%m"),
-        "day": dt_now.strftime("%d"),
-        "now": dt_now.strftime("%Y-%m-%d %H:%M:%S"),
-        "now_stripped": dt_now.strftime("%Y%m%d%H%M%S"),
-        "today": dt_now.strftime("%Y-%m-%d"),
-        "today_stripped": dt_now.strftime("%Y%m%d"),
-        "weekly_date": dt_weekly.strftime("%Y-%m-%d"),
-        "weekly_date_stripped": dt_weekly.strftime("%Y%m%d"),
-        "biweekly_date": dt_biweekly.strftime("%Y-%m-%d"),
-        "biweekly_date_stripped": dt_biweekly.strftime("%Y%m%d"),
-        "dynaconf_merge": True,
-    }
-
-    return config
-
-def get_project_metadata() -> ProjectMetadata:
-    caller_frame = inspect.stack()[1]
-    current_file_parts = Path(caller_frame.filename).resolve().parts
-    src_index = current_file_parts.index("src")
-
-    cmd_prefix = "dix vnc run --" if shutil.which("dix") else ""
-    package_name = current_file_parts[src_index + 1]
-    env_name = f"{package_name}_env"
-    project_path = Path(*current_file_parts[:src_index])
-    config_path = project_path / "config.toml"
-
-    return ProjectMetadata(
-        cmd_prefix, package_name, env_name, project_path, config_path
-    )
+class Project:
+    CONFIG_FILE_NAME = "config.toml"
+
+    def __init__(self, path: Path):
+        self.path = path
+
+        try:
+            self.pkg_name = next((self.path / "src").glob("*")).name
+        except StopIteration:
+            raise NoPackageFoundError()
+
+        self.env_name = f"{self.pkg_name}_env"
+        self.config_path = self.path / self.CONFIG_FILE_NAME
+        self.tests_path = self.path / "tests"
+        self.cmd_prefix = "dix vnc run --" if shutil.which("dix") else ""
+
+    @classmethod
+    def from_file(cls, file: Path | str) -> Self:
+        file_path = Path(file).resolve()
+
+        while file_path != file_path.parent:
+            config_file = file_path / cls.CONFIG_FILE_NAME
+
+            if not config_file.is_file():
+                file_path = file_path.parent
+                continue
+
+            if file_path.parent == Path("/home"):
+                raise NoProjectFoundError()
+
+            return cls(file_path)
+
+        raise NoProjectFoundError()
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "project_path": self.path,
+            "cmd_prefix": self.cmd_prefix,
+            "env_name": self.env_name,
+            "pkg_name": self.pkg_name,
+            "config_path": self.config_path,
+        }
+
+    def get_config(self, tz: str = "Europe/Madrid") -> Dynaconf:
+        add_converter("read", read_converter)
+
+        dt_now = get_granular_date("now", tz)
+        dt_weekly = get_granular_date("weekly", tz)
+        dt_biweekly = get_granular_date("biweekly", tz)
+
+        config = Dynaconf(
+            environments=True,
+            env_switcher="SYSTYPE",
+        )
+
+        config.load_file(path=self.config_path)
+        config.load_file(path=Path.home() / self.config_path.name)
+
+        config.vars = {
+            "year": dt_now.strftime("%Y"),
+            "month": dt_now.strftime("%m"),
+            "day": dt_now.strftime("%d"),
+            "now": dt_now.strftime("%Y-%m-%d %H:%M:%S"),
+            "now_stripped": dt_now.strftime("%Y%m%d%H%M%S"),
+            "today": dt_now.strftime("%Y-%m-%d"),
+            "today_stripped": dt_now.strftime("%Y%m%d"),
+            "weekly_date": dt_weekly.strftime("%Y-%m-%d"),
+            "weekly_date_stripped": dt_weekly.strftime("%Y%m%d"),
+            "biweekly_date": dt_biweekly.strftime("%Y-%m-%d"),
+            "biweekly_date_stripped": dt_biweekly.strftime("%Y%m%d"),
+            "dynaconf_merge": True,
+        }
+
+        return config
 
 
 def set_logger(level):

{datamarket-0.9.19.dist-info → datamarket-0.9.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.9.19
+Version: 0.9.20
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.9.19.dist-info → datamarket-0.9.20.dist-info}/RECORD

@@ -13,11 +13,11 @@ datamarket/params/nominatim.py,sha256=pBYRfoBkkLBg2INbFymefmYSzaAVujQSpEro5c1hD_
 datamarket/utils/__init__.py,sha256=8D5a8oKgqd6WA1RUkiKCn4l_PVemtyuckxQut0vDHXM,20
 datamarket/utils/airflow.py,sha256=al0vc0YUikNu3Oy51VSn52I7pMU40akFBOl_UlHa2E4,795
 datamarket/utils/alchemy.py,sha256=SRq6kgh1aANXVShBPgAuglmNhZssPWwWEY503gKSia8,635
-datamarket/utils/main.py,sha256=O6rX-65h4h0j2zs9dofdTPlly5reKDnvgLtTwbLmbWg,6529
+datamarket/utils/main.py,sha256=j8wnAxeLvijdRU9M4V6HunWH7vgWWHP4u4xamzkWcUU,7009
 datamarket/utils/selenium.py,sha256=IMKlbLzXABFhACnWzhHmB0l2hhVzNwHGZwbo14nEewQ,2499
 datamarket/utils/soda.py,sha256=eZTXFbI1P3WoMd1MM-YjoVTpdjTcDSWuvBb7ViBMhSQ,941
 datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
-datamarket-0.9.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-datamarket-0.9.19.dist-info/METADATA,sha256=yMqp6i6mEyKhwB6VOxXF5Gg1sldJSbkuB9HH2w3NdPQ,6459
-datamarket-0.9.19.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-datamarket-0.9.19.dist-info/RECORD,,
+datamarket-0.9.20.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+datamarket-0.9.20.dist-info/METADATA,sha256=2BsxMukyGFYw-lk455Ksf7NJ_M-mjNB7-_vl3nOdxQ4,6459
+datamarket-0.9.20.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+datamarket-0.9.20.dist-info/RECORD,,