use autosubmit db_structure

Author: LuiggiTenorioK

autosubmit_api/autosubmit_legacy/job/job_list.py

@@ -37,7 +37,7 @@
 from autosubmit_api.common.utils import Status
 from bscearth.utils.date import date2str, parse_date
 # from autosubmit_legacy.job.tree import Tree
-from autosubmit_api.database import db_structure as DbStructure
+from autosubmit.database import db_structure as DbStructure
 from autosubmit_api.database.db_jobdata import JobDataStructure, JobRow
 from autosubmit_api.builders.experiment_history_builder import ExperimentHistoryDirector, ExperimentHistoryBuilder
 from autosubmit_api.history.data_classes.job_data import JobData

autosubmit_api/components/jobs/joblist_loader.py

@@ -4,7 +4,7 @@
 from fnmatch import fnmatch
 from autosubmit_api.components.jobs.joblist_helper import JobListHelper
 from autosubmit_api.components.jobs.job_factory import StandardJob, Job
-from autosubmit_api.database.db_structure import get_structure
+from autosubmit.database import db_structure
 from autosubmit_api.common.utils import Status
 from bscearth.utils.date import date2str
 from typing import Dict, List, Set
@@ -144,7 +144,7 @@ def _generate_job_dictionary(self):
       self._job_dictionary[job.name] = job
 
   def load_existing_structure_adjacency(self):
-    self._structure_adjacency = get_structure(self.expid, self.configuration_facade.structures_path)
+    self._structure_adjacency = db_structure.get_structure(self.expid, self.configuration_facade.structures_path)
 
   def distribute_adjacency_into_jobs(self):
     parents_adjacency = {}

autosubmit_api/database/db_structure.py

@@ -1,28 +1,14 @@
-from sqlalchemy import MetaData, Integer, String, Text, Table
-from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped
-
-
-metadata_obj = MetaData()
-
+from sqlalchemy import Integer, Text, Table
+from sqlalchemy.orm import mapped_column, Mapped
+from autosubmit.database.tables import (
+    BaseTable,
+    ExperimentTable,
+    ExperimentStatusTable,
+    JobPackageTable,
+    WrapperJobPackageTable,
+)
 
 ## SQLAlchemy ORM tables
-class BaseTable(DeclarativeBase):
-    metadata = metadata_obj
-
-
-class ExperimentTable(BaseTable):
-    """
-    Is the main table, populated by Autosubmit. Should be read-only by the API.
-    """
-
-    __tablename__ = "experiment"
-
-    id: Mapped[int] = mapped_column(Integer, nullable=False, primary_key=True)
-    name: Mapped[str] = mapped_column(String, nullable=False)
-    description: Mapped[str] = mapped_column(String, nullable=False)
-    autosubmit_version: Mapped[str] = mapped_column(String)
-
-
 class DetailsTable(BaseTable):
     """
     Stores extra information. It is populated by the API.
@@ -38,20 +24,6 @@ class DetailsTable(BaseTable):
     hpc: Mapped[str] = mapped_column(Text, nullable=False)
 
 
-class ExperimentStatusTable(BaseTable):
-    """
-    Stores the status of the experiments
-    """
-
-    __tablename__ = "experiment_status"
-
-    exp_id: Mapped[int] = mapped_column(Integer, primary_key=True)
-    name: Mapped[str] = mapped_column(Text, nullable=False)
-    status: Mapped[str] = mapped_column(Text, nullable=False)
-    seconds_diff: Mapped[int] = mapped_column(Integer, nullable=False)
-    modified: Mapped[str] = mapped_column(Text, nullable=False)
-
-
 class GraphDataTable(BaseTable):
     """
     Stores the coordinates and it is used exclusively to speed up the process
@@ -66,33 +38,6 @@ class GraphDataTable(BaseTable):
     y: Mapped[int] = mapped_column(Integer, nullable=False)
 
 
-class JobPackageTable(BaseTable):
-    """
-    Stores a mapping between the wrapper name and the actual job in slurm
-    """
-
-    __tablename__ = "job_package"
-
-    exp_id: Mapped[str] = mapped_column(Text)
-    package_name: Mapped[str] = mapped_column(Text, primary_key=True)
-    job_name: Mapped[str] = mapped_column(Text, primary_key=True)
-
-
-class WrapperJobPackageTable(BaseTable):
-    """
-    It is a replication. It is only created/used when using inspectand create or monitor
-    with flag -cw in Autosubmit.\n
-    This replication is used to not interfere with the current autosubmit run of that experiment
-    since wrapper_job_package will contain a preview, not the real wrapper packages
-    """
-
-    __tablename__ = "wrapper_job_package"
-
-    exp_id: Mapped[str] = mapped_column(Text)
-    package_name: Mapped[str] = mapped_column(Text, primary_key=True)
-    job_name: Mapped[str] = mapped_column(Text, primary_key=True)
-
-
 ## SQLAlchemy Core tables
 
 # MAIN_DB TABLES
@@ -107,4 +52,4 @@ class WrapperJobPackageTable(BaseTable):
 
 # Job package TABLES
 job_package_table: Table = JobPackageTable.__table__
-wrapper_job_package_table: Table = WrapperJobPackageTable.__table__
+wrapper_job_package_table: Table = WrapperJobPackageTable.__table__

autosubmit_api/database/tables.py

@@ -32,7 +32,7 @@ def get_authors():
     "scipy~=1.7.3",
     "python-dotenv",
     "autosubmitconfigparser~=1.0.48",
-    "autosubmit>=3.13",
+    "autosubmit>=4.2.0",
     "Flask-APScheduler",
     "gunicorn",
     "pydantic~=2.5.2",