esgvoc 0.2.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

esgvoc/core/service/configuration/setting.py

@@ -0,0 +1,88 @@
+from typing import ClassVar, Dict, Optional
+import toml
+from pydantic import BaseModel, Field
+
+
+class ProjectSettings(BaseModel):
+    project_name: str
+    github_repo: str
+    branch: Optional[str] = "main"
+    local_path: Optional[str] = None
+    db_path: Optional[str] = None
+
+
+class UniverseSettings(BaseModel):
+    github_repo: str
+    branch: Optional[str] = None
+    local_path: Optional[str] = None
+    db_path: Optional[str] = None
+
+
+class ServiceSettings(BaseModel):
+    universe: UniverseSettings
+    projects: Dict[str, ProjectSettings] = Field(default_factory=dict)
+
+    # 🔹 Define default settings
+    DEFAULT_SETTINGS : ClassVar[dict]= {
+        "universe": {
+            "github_repo": "https://github.com/WCRP-CMIP/WCRP-universe",
+            "branch": "esgvoc",
+            "local_path": "repos/WCRP-universe",
+            "db_path": "dbs/universe.sqlite",
+        },
+        "projects": [
+            {
+                "project_name": "cmip6",
+                "github_repo": "https://github.com/WCRP-CMIP/CMIP6_CVs",
+                "branch": "esgvoc",
+                "local_path": "repos/CMIP6_CVs",
+                "db_path": "dbs/cmip6.sqlite",
+            },
+            {
+                "project_name": "cmip6plus",
+                "github_repo": "https://github.com/WCRP-CMIP/CMIP6Plus_CVs",
+                "branch": "esgvoc",
+                "local_path": "repos/CMIP6Plus_CVs",
+                "db_path": "dbs/cmip6plus.sqlite",
+            },
+        ],
+    }
+
+    @classmethod
+    def load_from_file(cls, file_path: str) -> "ServiceSettings":
+        """Load configuration from a TOML file, falling back to defaults if necessary."""
+        try:
+            data = toml.load(file_path)
+        except FileNotFoundError:
+            data = cls.DEFAULT_SETTINGS  # Use defaults if the file is missing
+
+        projects = {p["project_name"]: ProjectSettings(**p) for p in data.pop("projects", [])}
+        return cls(universe=UniverseSettings(**data["universe"]), projects=projects)
+
+    @classmethod
+    def load_default(cls) -> "ServiceSettings":
+        """Load default settings."""
+        return cls.load_from_dict(cls.DEFAULT_SETTINGS)
+
+    @classmethod
+    def load_from_dict(cls, config_data: dict) -> "ServiceSettings":
+        """Load configuration from a dictionary."""
+        projects = {p["project_name"]: ProjectSettings(**p) for p in config_data.get("projects", [])}
+        return cls(universe=UniverseSettings(**config_data["universe"]), projects=projects)
+
+    def save_to_file(self, file_path: str):
+        """Save the configuration to a TOML file."""
+        data = {
+            "universe": self.universe.model_dump(),
+            "projects": [p.model_dump() for p in self.projects.values()],
+        }
+        with open(file_path, "w") as f:
+            toml.dump(data, f)
+            
+    def dump(self)->dict:
+        data = {
+            "universe": self.universe.model_dump(),
+            "projects": [p.model_dump() for p in self.projects.values()],
+        }
+        return data
+

esgvoc/core/service/state.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Optional
 
 from esgvoc.core.repo_fetcher import RepoFetcher
-from esgvoc.core.service.settings import UniverseSettings, ProjectSettings, ServiceSettings
+from esgvoc.core.service.configuration.setting import UniverseSettings, ProjectSettings, ServiceSettings
 from esgvoc.core.db.connection import DBConnection
 
 from rich.table import Table
@@ -13,27 +13,38 @@ from sqlmodel import select
 from esgvoc.core.db.models.universe import Universe
 from esgvoc.core.db.models.project import Project
 
+
 logger = logging.getLogger(__name__)
 
 class BaseState:
     def __init__(self, github_repo: str, branch: str = "main", local_path: Optional[str] = None, db_path: Optional[str] = None):
-    
-        self.github_repo = github_repo
-        self.branch = branch
-        self.github_access = True # False if we dont have internet and some other cases 
-        self.github_version = None
         
-        self.local_path = local_path
-        self.local_access = True # False if we dont have cloned the remote repo yet
-        self.local_version = None
+        from esgvoc.core.service import config_manager
+        self.base_dir = config_manager.data_config_dir # needed for repofetcher 
+        
+        self.github_repo : str = github_repo
+        self.branch : str = branch
+        self.github_access : bool = True # False if we dont have internet and some other cases 
+        self.github_version : str | None = None
         
-        self.db_path = db_path
-        self.db_access = True  # False if we cant access the db for some reason
-        self.db_version = None
+        self.local_path : str | None = self._get_absolute_path(str(self.base_dir),local_path)
+        self.local_access : bool = True # False if we dont have cloned the remote repo yet
+        self.local_version : str | None = None
         
-        self.rf = RepoFetcher()
+        self.db_path : str | None = self._get_absolute_path(str(self.base_dir), db_path)
+        self.db_access : bool = True  # False if we cant access the db for some reason
+        self.db_version : str | None = None
+        
+        self.rf = RepoFetcher(local_path=str(self.base_dir))
         self.db_connection:DBConnection|None = None
-        self.db_sqlmodel = None
+        self.db_sqlmodel :Universe | Project| None = None
+
+    def _get_absolute_path(self,base_dir:str,path:str|None)->str|None:
+        if base_dir !="" and path is not None:
+            return base_dir + "/"+ path
+        if base_dir == "":
+            return path
+
     
     def fetch_version_local(self):
          if self.local_path:
@@ -54,9 +65,12 @@ class BaseState:
                 self.github_version = self.rf.get_github_version(owner, repo, self.branch) 
                 self.github_access = True
                 logger.debug(f"Latest GitHub commit: {self.github_version}")
+            except IndexError as e:
+                self.github_access = False
             except Exception as e:
                 logger.exception(f"Failed to fetch GitHub version: {e} ,for {self.github_repo},owner : {owner}, repo : {repo},branch : {self.branch}")
                 self.github_access = False
+        
             if self.github_version is None:
                 self.github_access = False
 
@@ -67,7 +81,7 @@ class BaseState:
                 self.db_access = False
             else:
                 try:
-                    self.db_connection =DBConnection(db_file_path= Path(self.db_path)) 
+                    self.db_connection = DBConnection(db_file_path= Path(self.db_path)) 
                     with self.db_connection.create_session() as session:
                         self.db_version = session.exec(select(self.db_sqlmodel.git_hash)).one()
                         self.db_access = True
@@ -82,7 +96,8 @@ class BaseState:
 
 
     def fetch_versions(self):
-        self.fetch_version_remote()
+        if self.github_access:
+            self.fetch_version_remote()
         self.fetch_version_local()
         self.fetch_version_db()
               
@@ -92,18 +107,17 @@ class BaseState:
             "github" : self.github_version if self.github_version else None,
             "local": self.local_version if self.local_version else None,
             "db" : self.db_version if self.db_version else None,
-            "github_local_sync": self.github_version == self.local_version if self.github_access and self.github_version and self.local_version else None,
-            "local_db_sync": self.local_version == self.db_version if self.local_access and self.local_version and self.db_version else None,
-
-            "github_db_sync": self.github_version == self.db_version if self.github_access and self.github_version and self.db_version else None
+            "github_local_sync": self.github_version == self.local_version if self.github_access and self.github_version and self.local_version else False,
+            "local_db_sync": self.local_version == self.db_version if self.local_access and self.local_version else False,
+            "github_db_sync": self.github_version == self.db_version if self.github_access and self.github_version else False
         }
 
     def clone_remote(self):
         owner, repo = self.github_repo.lstrip("https://github.com/").split("/")
-        #TODO add destination "local_path" in clone_repo 
-        self.rf.clone_repository(owner, repo, self.branch)
+        #TODO add destination "local_path" in clone_repo, done in a wierd way Improve that:  
+        self.rf.clone_repository(owner, repo, self.branch, self.local_path)
         self.fetch_version_local()
-
+        
     
     def build_db(self):
         from esgvoc.core.db.project_ingestion import ingest_project
@@ -121,25 +135,25 @@ class BaseState:
             if self.db_sqlmodel == Universe: # Ugly 
                 print("Building Universe DB from ",self.local_path)
                 universe_create_db(Path(self.db_path))
-                ingest_metadata_universe(DBConnection(Path(self.db_path)),self.local_version)
+                self.db_connection = DBConnection(db_file_path= Path(self.db_path)) 
+
+                ingest_metadata_universe(self.db_connection,self.local_version)
                 print("Filling Universe DB")
-                ingest_universe(Path(self.local_path), Path(self.db_path))
+                if self.local_path:
+                    ingest_universe(Path(self.local_path), Path(self.db_path))
 
             elif self.db_sqlmodel == Project:
                 print("Building Project DB from ", self.local_path)
                 project_create_db(Path(self.db_path))
                 print("Filling project DB")
-                ingest_project(Path(self.local_path),Path(self.db_path),self.local_version)
+                if self.local_path and self.local_version:
+                    ingest_project(Path(self.local_path),Path(self.db_path),self.local_version)
         self.fetch_version_db()
 
 
 
-
-        
-
     def sync(self):
         summary = self.check_sync_status()
-
         if self.github_access and summary["github_db_sync"] is None and summary["local_db_sync"]is None and summary["github_local_sync"] is None:
             self.clone_remote()
             self.build_db()
@@ -148,7 +162,7 @@ class BaseState:
             if not summary["local_db_sync"] and summary["local_db_sync"] is not None:
                 self.clone_remote()
                 self.build_db()
-            elif not summary["github_local_sync"] and summary["github_local_sync"] is not None:
+            elif not summary["github_local_sync"] :
                 self.clone_remote()
                 self.build_db()
             else: # can be simply build in root and clone if neccessary
@@ -194,13 +208,16 @@ class StateService:
             proj_state.fetch_versions()
 
     def synchronize_all(self):
+        print("sync universe")
         self.universe.sync()
+        print("sync projects")
         for project in self.projects.values():
             project.sync()
+
     def table(self):
         table = Table(show_header=False, show_lines=True)
         table.add_row("","Remote github repo","Local repository","Cache Database")
-        table.add_row("Universe path",self.universe.github_repo,self.universe.local_path,self.universe.db_path)
+        table.add_row("Universe path",self.universe.github_repo,self.universe.local_path,self.universe.db_path) 
         table.add_row("Version",self.universe.github_version,self.universe.local_version,self.universe.db_version)
         for proj_name,proj in self.projects.items():
 

{esgvoc-0.2.1.dist-info → esgvoc-0.4.0.dist-info}/METADATA

@@ -1,17 +1,16 @@
 Metadata-Version: 2.3
 Name: esgvoc
-Version: 0.2.1
+Version: 0.4.0
 Summary: python library and CLI to interact with WCRP CVs
 Project-URL: Repository, https://github.com/ESGF/esgf-vocab
 Author-email: Sébastien Gardoll <sebastien@gardoll.fr>, Guillaume Levavasseur <guillaume.levavasseur@ipsl.fr>, Laurent Troussellier <laurent.troussellier@ipsl.fr>
 License: CECILL-2.1
 Requires-Python: <3.13,>=3.12
 Requires-Dist: idna>=3.10
+Requires-Dist: platformdirs>=4.3.6
 Requires-Dist: pydantic>=2.9.2
 Requires-Dist: pyld>=2.0.4
 Requires-Dist: requests>=2.32.3
-Requires-Dist: sphinx-copybutton>=0.5.2
-Requires-Dist: sphinx-tabs>=3.4.7
 Requires-Dist: sqlalchemy>=2.0.36
 Requires-Dist: sqlmodel>=0.0.22
 Requires-Dist: toml>=0.10.2
@@ -56,3 +55,35 @@ Following this command to install or update the latest CVs.
 ```bash
 esgvoc install
 ```
+
+## How to contribute
+
+### Install Python dev environment
+
+* Pip
+
+```bash
+pip install -e .
+```
+
+* Rye
+
+```bash
+rye sync
+```
+
+### Linters & code formatters
+
+* Pip
+
+```bash
+pip install pre-commit
+pre-commit install
+```
+
+* Rye
+
+```bash
+rye install
+rye run pre-commit install
+```

esgvoc-0.4.0.dist-info/RECORD

@@ -0,0 +1,80 @@
+esgvoc/__init__.py,sha256=1U7uasmBR5VzekoxCEz4GBNgpPcsEU5BwY-QOSW37qA,66
+esgvoc/api/__init__.py,sha256=w68CdVRS553bDWezZoCTxIFq_vsP7mFluSoO4yUo_Uc,4130
+esgvoc/api/project_specs.py,sha256=a-hEL-tXsfvwFeSU5PBnQZq_tqB7L67wxpB1ACah-no,2330
+esgvoc/api/projects.py,sha256=y6qcBSuW22a4nDB9V8lU6PFUj1j2SOrj3xtu9FKVyS4,57466
+esgvoc/api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+esgvoc/api/report.py,sha256=OlK5ApnaikMKmC6FyJ1uTSBeTezZe85yTCJwsk14uZE,3526
+esgvoc/api/search.py,sha256=Ss_-EvCQHZc6pBTDJzPUrOE_ErTcdqa-zmLkcBjsVkk,6667
+esgvoc/api/universe.py,sha256=8aEvkTHWv9PEWz9hw_JYDdjJBbHzizi_RdVg9Ua-ook,21830
+esgvoc/api/data_descriptors/__init__.py,sha256=6ldSy7x4rnol7ZykPBn9xtnKq1bT_d8G19LIyJnc_mw,3248
+esgvoc/api/data_descriptors/activity.py,sha256=HZIaFqOVeYKmMJd1B_ihbKTAAAr13wr8IFISZI_jdO8,620
+esgvoc/api/data_descriptors/area_label.py,sha256=sJqHuuLeXqDajZfEatAWX7Jot6I0xnCd1gvFJaA2s_M,161
+esgvoc/api/data_descriptors/branded_suffix.py,sha256=7uvoUfJ5KBWMWmEu_QmjJ9wEzLhvqGuFqsvdS9sXrNQ,157
+esgvoc/api/data_descriptors/branded_variable.py,sha256=vnZxR3EQv9X1z3pRmY_4C_sXkKkYf9-9gebY_F2ldDI,159
+esgvoc/api/data_descriptors/consortium.py,sha256=F8qFon8aKnVrUDkrBIg1DoQwZLUNt8QYUTQaxyYvMCI,807
+esgvoc/api/data_descriptors/data_descriptor.py,sha256=xmrJv1ZLMBBBysVZI6zCC2ZRyUwkOv-aKRHPw9d4bhk,3116
+esgvoc/api/data_descriptors/date.py,sha256=PsLSEI_qNXYxxgdcA2cmxmD5wo9Dd_uoaw9f5hmFHTs,131
+esgvoc/api/data_descriptors/directory_date.py,sha256=UcmBEV-n8-Nl6ML5xVjIswAnOVCvi25aJHj8-1HE8tY,140
+esgvoc/api/data_descriptors/experiment.py,sha256=dZQe0VURghn5zZuX3fPRx9ukGqe4R-8IoIsw7iEiKNY,1073
+esgvoc/api/data_descriptors/forcing_index.py,sha256=ELEUgv5VaRD548EEl1T-_PpdqPdz1rmWPdh-7mfGLQU,139
+esgvoc/api/data_descriptors/frequency.py,sha256=LmDjBSAwHi8vuHIz3SW0r4ewrqh1W94kbFEetCJuPNs,193
+esgvoc/api/data_descriptors/grid_label.py,sha256=HuR37-usYh6FjzE2_e6b7WBbrgAvyjUCc29NJnBEHDE,197
+esgvoc/api/data_descriptors/horizontal_label.py,sha256=V-QkV5Qn3uVYAZ6BGCiaTLxlBx9x1bJZ_nc6H8kH00s,167
+esgvoc/api/data_descriptors/initialisation_index.py,sha256=IknUFQkFCsyvawsUETomiVYhR1vEmCZSeeMqfgie0_8,146
+esgvoc/api/data_descriptors/institution.py,sha256=8AzWTg9tNqkpVa9TnAmfx119opZ_JzvXnnJg-VuSmDE,542
+esgvoc/api/data_descriptors/license.py,sha256=nJaVoJ-CGHd1JYDE8-mo0P6xljRKg1Y9ZopEOcWLeVk,176
+esgvoc/api/data_descriptors/mip_era.py,sha256=WsNPE1t8LBY9HXz97SVoQHWRz0Ao0_5-e1fO4J1lEAE,177
+esgvoc/api/data_descriptors/model_component.py,sha256=rmpKs0njm4mKQ2lxTV0vhZ4aORBSCuouI5zT_DzW6ZE,227
+esgvoc/api/data_descriptors/organisation.py,sha256=m5CHah1NxVl0OmNOUb_Nln8MwMG_Mx-Y3VRlpqY377w,135
+esgvoc/api/data_descriptors/physic_index.py,sha256=jWa1sQdLm90U0TY1JdQ3kgnhhpyJaMUswxdjamMJy8U,138
+esgvoc/api/data_descriptors/product.py,sha256=PYsV_mu8jj62pv4FQJcUoqe7MM_9JqRe-Otn4RdrgQw,157
+esgvoc/api/data_descriptors/realisation_index.py,sha256=zWgUnoM0DWsME5WciQUjb7pIw_FAzDfGPDCyGQ4xSOo,143
+esgvoc/api/data_descriptors/realm.py,sha256=s1J-FsTlEr_BOgW3veynUPVzSwbv71V03TWM4wbUYds,154
+esgvoc/api/data_descriptors/resolution.py,sha256=cEfu1XstWsVIwRs4z34lcyP5wiZYNMyhWNQZ5IplVps,190
+esgvoc/api/data_descriptors/source.py,sha256=IAVh0a3yXEOv0_O025wIRPyZET5_EwgyPxCKfyBwOQ8,1128
+esgvoc/api/data_descriptors/source_type.py,sha256=FQUQwAix2JDo_rx_E-iVV5vHdL3pVGajoSaQMCjDOGQ,145
+esgvoc/api/data_descriptors/sub_experiment.py,sha256=HAQLq8Aq9XQjdmKfkAewTAe4rO7oTiEGdPqhDITVzJg,149
+esgvoc/api/data_descriptors/table.py,sha256=rZp5CpoJSFzc869IaJOMjMDTb6KfcUEZM_fthtVt1Gc,254
+esgvoc/api/data_descriptors/temporal_label.py,sha256=lcEfH36GmWEYL83B0uG5S5Uat17GG8F-9EeFiZ3O01M,165
+esgvoc/api/data_descriptors/time_range.py,sha256=4G9-69DG9bikb1-X9ja2Hsocd_id0Fhco7L35E0uf-c,151
+esgvoc/api/data_descriptors/variable.py,sha256=WtWlYRO0NLPRn1qe7Dt84doJWZYNCvCCqhC0slOPidk,1014
+esgvoc/api/data_descriptors/variant_label.py,sha256=FL8nz0BfvJgKFjMmfBgNyRb8jcHaLBDLPpOvr6mBx9A,155
+esgvoc/api/data_descriptors/vertical_label.py,sha256=g2t-38eE-FY4H_aHrOj-ScZSPHIX6m71oltLcRHOtqI,141
+esgvoc/apps/__init__.py,sha256=Kyq36qRjvTWN7gu4_iFaLOjNUYvW0k1xp8bvkgJlQ5w,269
+esgvoc/apps/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+esgvoc/apps/drs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+esgvoc/apps/drs/constants.py,sha256=rVWq1QQwAFgISjvl3YzJDLLPNUPXHpqgv66spmjyPMQ,96
+esgvoc/apps/drs/generator.py,sha256=M0QMtpAaMU4E0142FPqdhix3n034CU_QaPuwvXsWtlA,22392
+esgvoc/apps/drs/report.py,sha256=ZRu5l6T-U-hqY7O3ZwAseYbWZPcJiMhJ2dpFKZJE3Gk,17371
+esgvoc/apps/drs/validator.py,sha256=yNijdOPhF9adgZbya5Ugvs13GbL4MvgQepCT38A66vM,13825
+esgvoc/cli/drs.py,sha256=PvVbLxef34A1IO600AFWOEWb5iLaWrBRHwwgMJ4u-PM,9237
+esgvoc/cli/get.py,sha256=zwLWkWOfAddK5onyRjWZ0zU909MtTDjEB_YrQtIwXqw,5242
+esgvoc/cli/install.py,sha256=zMssevZDrigrUlw1QHWITGUL1TvsHMZBQdYeNtHgWQA,433
+esgvoc/cli/main.py,sha256=kjB-yus-cmG9rOmVIPBhmjOr3tkwB13dHLcNqrdpYAM,483
+esgvoc/cli/status.py,sha256=hmpyrszrb5ke9l_1SgendPSeoXW1h-h7nH0zGFt_vUw,1357
+esgvoc/cli/valid.py,sha256=XrseGONeWR6gnnwZrRMJNjVBFQLT82Uzn5rHrjjM1Uk,7040
+esgvoc/core/constants.py,sha256=i03VR29sQmg89DdQpGZ1fzBT-elT3-_S0bTNraGA6T4,432
+esgvoc/core/convert.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+esgvoc/core/data_handler.py,sha256=BmcD_dSvX5fCkUEGAQnadPTeuKA7IvgMmQtesMXKh5g,5004
+esgvoc/core/exceptions.py,sha256=hs2D1lRWYhFuXDRbApKyJmEZMs8HxTPlSGkDSpkeQiA,538
+esgvoc/core/logging.conf,sha256=GK52lsTu17CfC2tKiMAIvkuHkIt5tqPmkWv68COOilc,278
+esgvoc/core/logging_handler.py,sha256=VgRBWeW_xdC4HtXG0TleQFwoy_YbJR4wlpci_sFezK0,147
+esgvoc/core/repo_fetcher.py,sha256=Rg668F4NN60jd8Ydz9dXpJQxd2eQOgaO0Ziwm53mcaI,9823
+esgvoc/core/db/__init__.py,sha256=fszGxJfRUa6uuuogrdh8_ExtdyMLZSaaVawpdgXzqKM,113
+esgvoc/core/db/connection.py,sha256=AIFo0IWznu0Alk0SK_4bqp6FL5ZqSezNrfc_AlM9Z14,882
+esgvoc/core/db/project_ingestion.py,sha256=M0Yruh7w--Q9JyRnbLynoPiVfmufp8b6h5UuUeNnnPA,7687
+esgvoc/core/db/universe_ingestion.py,sha256=vPNr_svmduX3JKuLA_-SQMTxO2FWMqCNyCWkPSDznNE,6522
+esgvoc/core/db/models/mixins.py,sha256=S4_6iuKf1kYLdUXAgqRKSTXs8H9I--43MKlEq4F-dm4,445
+esgvoc/core/db/models/project.py,sha256=hkDCPJNo3wGt-UMOfujeQYPgju_aH1oExDAnIgoe96M,4369
+esgvoc/core/db/models/universe.py,sha256=vrR1TMD9ZI6RSGRi-qnLEKHD2Qk6Mh3qz8gciPgsELQ,4199
+esgvoc/core/service/__init__.py,sha256=hveqCB4oC6gKDf_L-wZxu9iBz7RiY4x9OeJGP6S5xtU,1534
+esgvoc/core/service/data_merger.py,sha256=GNFp5DTV2jlBVJZNpILngi6jCbUvVGcqka4EMWKj_Os,3456
+esgvoc/core/service/esg_voc.py,sha256=5G0P4_xmQzoI_RG_agpq-yHoYYZx220P27v2nPrpyNs,2420
+esgvoc/core/service/state.py,sha256=f1Pb11yYRAcLyK93zJ60i5l-mifDXP8_81tJQtMAvPo,10622
+esgvoc/core/service/configuration/config_manager.py,sha256=K-gU3Kd-eJMunxDKOk4x72CRcyJ50IZXLfqQgyI9zTs,8282
+esgvoc/core/service/configuration/setting.py,sha256=WJgo9ZjZJrTGR9WEBhp1d7ab0Yb2Y6XmnO1oImTPc2s,3042
+esgvoc-0.4.0.dist-info/METADATA,sha256=rDbK18ahBLJtPMTi00NI64tEhNn8ulPlfvMoJ4TBIlc,2165
+esgvoc-0.4.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+esgvoc-0.4.0.dist-info/entry_points.txt,sha256=ZXufSC7Jlx1lb52U6Buv9IitJMcqAAXOerR2V9DaIto,48
+esgvoc-0.4.0.dist-info/licenses/LICENSE.txt,sha256=rWJoZt3vach8ZNdLq-Ee5djzCMFnJ1gIfBeJU5RIop4,21782
+esgvoc-0.4.0.dist-info/RECORD,,

esgvoc/api/_utils.py

@@ -1,39 +0,0 @@
-from typing import Sequence
-
-
-import esgvoc.core.constants as api_settings
-from esgvoc.api.data_descriptors import DATA_DESCRIPTOR_CLASS_MAPPING
-from esgvoc.core.db.models.project import PTerm
-from esgvoc.core.db.models.universe import UTerm
-from pydantic import BaseModel
-from sqlmodel import Session
-
-import esgvoc.core.service as service
-UNIVERSE_DB_CONNECTION = service.state_service.universe.db_connection
-
-
-def get_pydantic_class(data_descriptor_id_or_term_type: str) -> type[BaseModel]:
-    if data_descriptor_id_or_term_type in DATA_DESCRIPTOR_CLASS_MAPPING:
-        return DATA_DESCRIPTOR_CLASS_MAPPING[data_descriptor_id_or_term_type]
-    else:
-        raise ValueError(f"{data_descriptor_id_or_term_type} pydantic class not found")
-
-
-def get_universe_session() -> Session:
-
-    if UNIVERSE_DB_CONNECTION:
-        return UNIVERSE_DB_CONNECTION.create_session()
-    else:
-        raise RuntimeError('universe connection is not initialized')
-
-
-def instantiate_pydantic_term(term: UTerm|PTerm) -> BaseModel:
-    term_class = get_pydantic_class(term.specs[api_settings.TERM_TYPE_JSON_KEY])
-    return term_class(**term.specs)
-
-
-def instantiate_pydantic_terms(db_terms: Sequence[UTerm|PTerm],
-                               list_to_populate: list[BaseModel]) -> None:
-    for db_term in db_terms:
-        term = instantiate_pydantic_term(db_term)
-        list_to_populate.append(term)

esgvoc/cli/config.py

@@ -1,82 +0,0 @@
-
-import json
-from rich.syntax import Syntax
-import typer
-from esgvoc.core.service.settings import SETTINGS_FILE, ServiceSettings, load_settings
-from rich import print
-import toml
-
-app = typer.Typer()
-
-
-def get_nested_value(settings_dict: dict, key_path: str):
-    """Navigate through nested dictionary keys using dot-separated key paths."""
-    keys = key_path.split(".")
-    value = settings_dict
-    for key in keys:
-        value = value[key]
-    return value
-
-def set_nested_value(settings_dict: dict, key_path: str, new_value):
-    """Set a value in a nested dictionary using a dot-separated key path."""
-    keys = key_path.split(".")
-    sub_dict = settings_dict
-    for key in keys[:-1]:
-        sub_dict = sub_dict[key]
-    sub_dict[keys[-1]] = new_value
-    return settings_dict
-    
-@app.command()
-def config(key: str |None = typer.Argument(None), value: str|None = typer.Argument(None)):
-    """
-    Manage configuration settings.
-
-    - With no arguments: display all settings.
-    - With one argument (key): display the value of the key.
-    - With two arguments (key and value): modify the key's value and save.
-
-    usage : 
-    esgvoc config universe.db_path .cache/dbs/somethingelse
-    """
-    
-    settings = load_settings()
-    if key is None:
-        # No key provided, print all settings
-        # typer.echo(settings.model_dump())
-        syntax = Syntax(toml.dumps(settings.model_dump()), "toml")
-        print(syntax) 
-        return
-    if value is None:
-        # Key provided but no value, print the specific key's value
-        try:
-            selected_value = get_nested_value(json.loads(settings.model_dump_json()),key)
-            typer.echo(selected_value)
-        except KeyError:
-            try: 
-                selected_value = get_nested_value(json.loads(settings.model_dump_json()),"projects."+key)
-                typer.echo(selected_value)
-                return 
-            except KeyError:
-                pass
-            typer.echo(f"Key '{key}' not found in settings.")
-        return
-
-    # Modify the key's value
-    try :
-        selected_value = get_nested_value(json.loads(settings.model_dump_json()),key)
-    except Exception:
-        key = "projects."+key
-    try : 
-        selected_value = get_nested_value(json.loads(settings.model_dump_json()),key)
-        if selected_value:
-            new_settings_dict = set_nested_value(json.loads(settings.model_dump_json()),key, value )
-            new_settings = ServiceSettings(**new_settings_dict)
-            new_settings.save_to_file(str(SETTINGS_FILE)) #TODO improved that .. remove SETTINGS_FILE dependancy
-            # save_settings(new_settings)
-            typer.echo(f"New settings {new_settings.model_dump_json(indent=4)}")
-            typer.echo(f"Updated '{key}' to '{value}'.")
-        else:
-            typer.echo(f"Key '{key}' not found in settings.")
-    except Exception as e:
-        typer.echo(f"Error updating settings: {e}")
-

esgvoc/core/service/settings.py

@@ -1,73 +0,0 @@
-from pydantic import BaseModel, Field
-from typing import Dict, Optional
-from pathlib import Path
-import toml
-
-
-SETTINGS_FILE = Path(__file__).parent / "settings.toml"
-
-class ProjectSettings(BaseModel):
-    project_name: str
-    github_repo: str
-    branch: Optional[str] = "main"
-    local_path: Optional[str] = None
-    db_path: Optional[str] = None
-
-class UniverseSettings(BaseModel):
-    github_repo: str
-    branch: Optional[str] = None
-    local_path: Optional[str] = None
-    db_path: Optional[str] = None
-
-class ServiceSettings(BaseModel):
-    universe: UniverseSettings
-    projects: Dict[str, ProjectSettings] = Field(default_factory=dict)
-
-    @classmethod
-    def load_from_file(cls, file_path: str) -> "ServiceSettings":
-        data = toml.load(file_path)
-        projects = {p['project_name']: ProjectSettings(**p) for p in data.pop('projects', [])}
-        return cls(universe=UniverseSettings(**data['universe']), projects=projects)
-
-    def save_to_file(self, file_path: str):
-        data = {
-            "universe": self.universe.model_dump(),
-            "projects": [p.model_dump() for p in self.projects.values()]
-        }
-        with open(file_path, "w") as f:
-            toml.dump(data, f)
-
-def load_settings() -> ServiceSettings:
-    """Load the settings from the TOML file."""
-    if SETTINGS_FILE.exists():
-        return ServiceSettings.load_from_file(str(SETTINGS_FILE))
-    else:
-        default_settings = ServiceSettings(
-        universe=UniverseSettings(
-            github_repo="https://github.com/WCRP-CMIP/WCRP-universe",
-            branch="esgvoc",
-            local_path=".cache/repos/WCRP-universe",
-            db_path=".cache/dbs/universe.sqlite"
-        ),
-        projects={"cmip6plus":ProjectSettings(
-                project_name="CMIP6Plus_CVs",
-                github_repo="https://github.com/WCRP-CMIP/CMIP6Plus_CVs",
-                branch="esgvoc",
-                local_path=".cache/repos/CMIP6Plus_CVs",
-                db_path=".cache/dbs/cmip6plus.sqlite"
-                ),
-            
-            "cmip6":ProjectSettings(
-                project_name="CMIP6_CVs",
-                github_repo="https://github.com/WCRP-CMIP/CMIP6_CVs",
-                branch="esgvoc",
-                local_path=".cache/repos/CMIP6_CVs",
-                db_path=".cache/dbs/cmip6.sqlite"
-                )
-            }
-
-        )
-    
-
-        default_settings.save_to_file(str(SETTINGS_FILE))
-        return default_settings

esgvoc/core/service/settings.toml

@@ -1,17 +0,0 @@
-[[projects]]
-project_name = "cmip6"
-github_repo = "https://github.com/WCRP-CMIP/CMIP6_CVs"
-branch = "esgvoc"
-local_path = ".cache/repos/CMIP6_CVs"
-db_path = ".cache/dbs/cmip6.sqlite"
-[[projects]]
-project_name = "cmip6plus"
-github_repo = "https://github.com/WCRP-CMIP/CMIP6Plus_CVs"
-branch = "esgvoc"
-local_path = ".cache/repos/CMIP6Plus_CVs"
-db_path = ".cache/dbs/cmip6plus.sqlite"
-[universe]
-github_repo = "https://github.com/WCRP-CMIP/WCRP-universe"
-branch = "esgvoc"
-local_path = ".cache/repos/WCRP-universe"
-db_path = ".cache/dbs/universe.sqlite"

esgvoc/core/service/settings_default.toml

@@ -1,17 +0,0 @@
-[[projects]]
-project_name = "cmip6"
-github_repo = "https://github.com/WCRP-CMIP/CMIP6_CVs"
-branch = "esgvoc"
-local_path = ".cache/repos/CMIP6_CVs"
-db_path = ".cache/dbs/cmip6.sqlite"
-[[projects]]
-project_name = "cmip6plus"
-github_repo = "https://github.com/WCRP-CMIP/CMIP6Plus_CVs"
-branch = "esgvoc"
-local_path = ".cache/repos/CMIP6Plus_CVs"
-db_path = ".cache/dbs/cmip6plus.sqlite"
-[universe]
-github_repo = "https://github.com/WCRP-CMIP/WCRP-universe"
-branch = "esgvoc"
-local_path = ".cache/repos/WCRP-universe"
-db_path = ".cache/dbs/universe.sqlite"