R.C. 0.6.0 (#281)

DARPA-ASKEM · Aug 7, 2023 · 398f911 · 398f911
1 parent ed5cc68
commit 398f911
Show file tree

Hide file tree

Showing 57 changed files with 2,107 additions and 1,297 deletions.
diff --git a/migrate/scripts/seed_data.py b/migrate/scripts/seed_data.py
@@ -11,7 +11,10 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
-from tds.autogen import orm
+from tds.modules.external.model import Publication
+from tds.modules.model.model import ModelFramework
+from tds.modules.person.model import Person
+from tds.modules.project.model import Project, ProjectAsset
 from tds.modules.provenance.model import Provenance
 
 migrate_dir = Path(os.path.dirname(__file__))
@@ -24,12 +27,12 @@
 SQL_DB = os.getenv("SQL_DB")
 
 pg_data_load = {
- "model_framework": orm.ModelFramework,
- "persons": orm.Person,
- "projects": orm.Project,
- "project_assets": orm.ProjectAsset,
+ "model_framework": ModelFramework,
+ "persons": Person,
+ "projects": Project,
+ "project_assets": ProjectAsset,
  "provenance": Provenance,
- "publications": orm.Publication,
+ "publications": Publication,
 }
 
 

diff --git a/tds/autogen/README.md b/tds/autogen/README.md
diff --git a/tds/autogen/__init__.py b/tds/autogen/__init__.py
diff --git a/tds/autogen/orm.py b/tds/autogen/orm.py
diff --git a/tds/autogen/schema.py b/tds/autogen/schema.py
diff --git a/tds/db/base.py b/tds/db/base.py
@@ -7,11 +7,13 @@
 
 from elasticsearch import ConflictError
 from pydantic import BaseModel, Field
+from sqlalchemy.ext.declarative import declarative_base
 
 from tds.db import es_client
 from tds.settings import settings
 
 es = es_client()
+Base = declarative_base()
 
 
 def new_uuid() -> str:

diff --git a/tds/autogen/enums.py → tds/db/enums.py b/tds/autogen/enums.py → tds/db/enums.py
@@ -129,3 +129,18 @@ class SimulationStatus(str, Enum):
  queued = "queued"
  running = "running"
  failed = "failed"
+
+
+class ColumnTypes(str, Enum):
+ UNKNOWN = "unknown"
+ BOOLEAN = "boolean"
+ STRING = "string"
+ CHAR = "string"
+ INTEGER = "integer"
+ INT = "integer"
+ FLOAT = "float"
+ DOUBLE = "double"
+ TIMESTAMP = "timestamp"
+ DATETIME = "datetime"
+ DATE = "date"
+ TIME = "time"