Auto-update: Thu Aug 8 07:38:46 PDT 2024

sijapi/__init__.py

@@ -6,7 +6,7 @@ import multiprocessing
 from dotenv import load_dotenv
 from dateutil import tz
 from pathlib import Path
-from .classes import Geocoder, APIConfig, Configuration, Logger
+from .classes import Logger, Configuration, APIConfig, DirConfig, Geocoder
 
 # INITIALization
 BASE_DIR = Path(__file__).resolve().parent
@@ -19,8 +19,7 @@ L = Logger("Central", LOGS_DIR)
 
 # API essentials
 API = APIConfig.load('api', 'secrets')
-
+Dir = DirConfig.load('dirs')
-Dir = Configuration.load('dirs')
 HOST = f"{API.BIND}:{API.PORT}"
 LOCAL_HOSTS = [ipaddress.ip_address(localhost.strip()) for localhost in os.getenv('LOCAL_HOSTS', '127.0.0.1').split(',')] + ['localhost']
 SUBNET_BROADCAST = os.getenv("SUBNET_BROADCAST", '10.255.255.255')

sijapi/classes.py

@@ -136,24 +136,15 @@ class Configuration(BaseModel):
             path = base_path / path
         return path
 
-    def resolve_placeholders(self, data: Any) -> Any:
-        if isinstance(data, dict):
-            return {k: self.resolve_placeholders(v) for k, v in data.items()}
-        elif isinstance(data, list):
-            return [self.resolve_placeholders(v) for v in data]
-        elif isinstance(data, str):
-            return self.resolve_string_placeholders(data)
-        else:
-            return data
 
     def resolve_placeholders(self, data: Any) -> Any:
         if isinstance(data, dict):
             resolved_data = {k: self.resolve_placeholders(v) for k, v in data.items()}
-            home = Path(resolved_data.get('HOME', self.HOME)).expanduser()
+            home_dir = Path(resolved_data.get('HOME', self.HOME)).expanduser()
-            sijapi = home / "workshop" / "sijapi"
+            base_dir = Path(__file__).parent.parent
-            data_dir = sijapi / "data"
+            data_dir = base_dir / "data"
-            resolved_data['HOME'] = str(home)
+            resolved_data['HOME'] = str(home_dir)
-            resolved_data['SIJAPI'] = str(sijapi)
+            resolved_data['BASE'] = str(base_dir)
             resolved_data['DATA'] = str(data_dir)
             return resolved_data
         elif isinstance(data, list):
@@ -206,6 +197,89 @@ class Configuration(BaseModel):
         arbitrary_types_allowed = True
 
 
+
+class DirConfig(BaseModel):
+    HOME: Path = Path.home()
+
+    @classmethod
+    def load(cls, yaml_path: Union[str, Path]) -> 'DirConfig':
+        yaml_path = cls._resolve_path(yaml_path)
+
+        try:
+            with yaml_path.open('r') as file:
+                config_data = yaml.safe_load(file)
+
+            print(f"Loaded configuration data from {yaml_path}")
+
+            # Ensure HOME is set
+            if 'HOME' not in config_data:
+                config_data['HOME'] = str(Path.home())
+                print(f"HOME was not in config, set to default: {config_data['HOME']}")
+
+            instance = cls.create_dynamic_model(**config_data)
+            resolved_data = instance.resolve_placeholders(config_data)
+            return cls.create_dynamic_model(**resolved_data)
+
+        except Exception as e:
+            print(f"Error loading configuration: {str(e)}")
+            raise
+
+    @classmethod
+    def _resolve_path(cls, path: Union[str, Path], default_dir: str) -> Path:
+        base_path = Path(__file__).parent.parent
+        path = Path(path)
+        if not path.suffix:
+            path = base_path / 'sijapi' / default_dir / f"{path.name}.yaml"
+        elif not path.is_absolute():
+            path = base_path / path
+        return path
+
+    def resolve_placeholders(self, data: Any) -> Any:
+        if isinstance(data, dict):
+            resolved_data = {k: self.resolve_placeholders(v) for k, v in data.items()}
+            home_dir = Path(resolved_data.get('HOME', self.HOME)).expanduser()
+            base_dir = Path(__file__).parent.parent
+            data_dir = base_dir / "data"
+            resolved_data['HOME'] = str(home_dir)
+            resolved_data['BASE'] = str(base_dir)
+            resolved_data['DATA'] = str(data_dir)
+            return resolved_data
+        elif isinstance(data, list):
+            return [self.resolve_placeholders(v) for v in data]
+        elif isinstance(data, str):
+            return self.resolve_string_placeholders(data)
+        else:
+            return data
+
+    def resolve_string_placeholders(self, value: str) -> Path:
+        pattern = r'\{\{\s*([^}]+)\s*\}\}'
+        matches = re.findall(pattern, value)
+
+        for match in matches:
+            if match == 'HOME':
+                replacement = str(self.HOME)
+            elif hasattr(self, match):
+                replacement = str(getattr(self, match))
+            else:
+                replacement = value
+
+            value = value.replace('{{' + match + '}}', replacement)
+
+        return Path(value).expanduser()
+
+    @classmethod
+    def create_dynamic_model(cls, **data):
+        DynamicModel = create_model(
+            f'Dynamic{cls.__name__}',
+            __base__=cls,
+            **{k: (Path, v) for k, v in data.items()}
+        )
+        return DynamicModel(**data)
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
 # Configuration class for API & Database methods.
 class APIConfig(BaseModel):
     HOST: str

sijapi/config/dirs.yaml-example

@@ -1,5 +1,4 @@
-HOME: ~
+DATA: "{{ BASE }}/data"
-SIJAPI: "{{ HOME }}/workshop/sijapi"
+CONFIG: "{{ BASE }}/config"
-DATA: "{{ SIJAPI }}/data"
+LOGS: "{{ BASE }}/logs"
-CONFIG: "{{ SIJAPI }}/config"
+PODCAST: '{{ HOME }}/Library/Mobile Documents/iCloud~co~supertop~castro/Documents/Sideloads'
-LOGS: "{{ SIJAPI }}/logs"