refactor: move osw.model.static to opensemantic

Author: simontaurus

setup.cfg

@@ -49,6 +49,7 @@ package_dir =
 # For more information, check out https://semver.org/.
 install_requires =
     oold
+    opensemantic
     pydantic>=1.10.17
     datamodel-code-generator>=0.25
     mwclient>=0.11.0
@@ -69,7 +70,6 @@ install_requires =
     asyncio
     tqdm
     pybars3-wheel
-    backports.strenum; python_version<"3.11"
 
 [options.packages.find]
 where = src

src/osw/auth.py

@@ -7,10 +7,10 @@
 from warnings import warn
 
 import yaml
+from opensemantic import OswBaseModel
 from pydantic.v1 import PrivateAttr
 
 from osw.defaults import paths as default_paths
-from osw.model.static import OswBaseModel
 
 if TYPE_CHECKING:
     PossibleFilePath = Path

src/osw/controller/database.py

@@ -1,13 +1,13 @@
 from typing import Optional, Union
 
+from opensemantic import OswBaseModel
 from sqlalchemy import URL, create_engine
 from sqlalchemy import text as sql_text
 from sqlalchemy.engine import Engine
 
 import osw.model.entity as model
 from osw.auth import CredentialManager
 from osw.core import OSW
-from osw.model.static import OswBaseModel
 
 
 class DatabaseController(model.Database):

src/osw/controller/page_package.py

@@ -6,14 +6,14 @@
 from typing import Optional, Union
 from warnings import warn
 
+from opensemantic import OswBaseModel
 from pydantic.v1 import FilePath
 from typing_extensions import Dict, List
 
 import osw.model.page_package as model
 from osw.auth import CredentialManager
 from osw.model import page_package as package
 from osw.model.page_package import NAMESPACE_CONST_TO_NAMESPACE_MAPPING
-from osw.model.static import OswBaseModel
 from osw.utils.regex import RegExPatternExtended
 from osw.wtsite import WtPage, WtSite
 

src/osw/core.py

@@ -27,13 +27,13 @@
     set_resolver,
 )
 from oold.utils.codegen import OOLDJsonSchemaParser
+from opensemantic import OswBaseModel
 from pydantic import PydanticDeprecatedSince20
 from pydantic.v1 import BaseModel, Field, PrivateAttr, create_model, validator
 from pyld import jsonld
 
 import osw.model.entity as model
 from osw.defaults import params as default_params
-from osw.model.static import OswBaseModel
 from osw.utils.oold import (
     AggregateGeneratedSchemasParam,
     AggregateGeneratedSchemasParamMode,
@@ -587,7 +587,7 @@ def _fetch_schema(self, fetchSchemaParam: _FetchSchemaParam = None) -> None:
                     --input {schema_path} \
                     --input-file-type jsonschema \
                     --output {temp_model_path} \
-                    --base-class osw.model.static.OswBaseModel \
+                    --base-class opensemantic.OswBaseModel \
                     --use-default \
                     --use-unique-items-as-set \
                     --enum-field-as-literal all \
@@ -614,7 +614,7 @@ def _fetch_schema(self, fetchSchemaParam: _FetchSchemaParam = None) -> None:
                     input_=pathlib.Path(schema_path),
                     input_file_type="jsonschema",
                     output=pathlib.Path(temp_model_path),
-                    base_class="osw.model.static.OswBaseModel",
+                    base_class="opensemantic.OswBaseModel",
                     # use_default=True,
                     apply_default_values_for_required_fields=True,
                     use_unique_items_as_set=True,
@@ -647,7 +647,7 @@ def _fetch_schema(self, fetchSchemaParam: _FetchSchemaParam = None) -> None:
                 # parser = OOLDJsonSchemaParserFixedRefs(
                 #     source=pathlib.Path(schema_path),
 
-                #     base_class="osw.model.static.OswBaseModel",
+                #     base_class="opensemantic.OswBaseModel",
                 #     data_model_type=data_model_types.data_model,
                 #     data_model_root_type=data_model_types.root_model,
                 #     data_model_field_type=data_model_types.field_model,
@@ -720,8 +720,8 @@ def _fetch_schema(self, fetchSchemaParam: _FetchSchemaParam = None) -> None:
                 header = (
                     "from uuid import uuid4\n"
                     "from typing import Type, TypeVar\n"
-                    "from osw.model.static import OswBaseModel, Ontology\n"
-                    # "from osw.model.static import *\n"
+                    "from opensemantic import OswBaseModel\n"
+                    # "from opensemantic import *\n"
                     "\n"
                 )
 

src/osw/data/mining.py

@@ -6,5 +6,5 @@
 #
 # from pydantic import validator
 #
-# from osw.model.static import OswBaseModel
+# from opensemantic import OswBaseModel
 # from osw.utils.strings import *

src/osw/defaults.py

@@ -4,9 +4,7 @@
 from pathlib import Path
 from typing import List, Union
 
-from pydantic.v1 import PrivateAttr, validator
-
-from osw.model.static import BaseModel
+from pydantic.v1 import BaseModel, PrivateAttr, validator
 
 PACKAGE_ROOT_PATH = Path(__file__).parents[2]
 SRC_PATH = PACKAGE_ROOT_PATH / "src"

src/osw/express.py

@@ -12,6 +12,7 @@
 from warnings import warn
 
 import requests
+from opensemantic import OswBaseModel
 from pydantic.v1 import validator
 from typing_extensions import (
     IO,
@@ -30,7 +31,6 @@
 from osw.core import OSW, OVERWRITE_CLASS_OPTIONS, OverwriteOptions
 from osw.defaults import params as default_params
 from osw.defaults import paths as default_paths
-from osw.model.static import OswBaseModel
 from osw.utils.wiki import namespace_from_full_title, title_from_full_title
 from osw.wtsite import WtSite
 

src/osw/model/entity.py

@@ -8,10 +8,9 @@
 from typing import Any, List, Optional, Set, Union
 from uuid import UUID
 
+from opensemantic import OswBaseModel
 from pydantic.v1 import Field, constr
 
-from osw.model.static import OswBaseModel
-
 
 class Level(str, Enum):
     public = "public"
@@ -22,7 +21,7 @@ class Level(str, Enum):
 from typing import Type, TypeVar
 from uuid import uuid4
 
-from osw.model.static import Ontology, OswBaseModel
+from opensemantic import OswBaseModel
 
 
 class ReadAccess(OswBaseModel):
@@ -677,10 +676,9 @@ class Config:
 from typing import Any, List, Optional, Set, Union
 from uuid import UUID
 
+from opensemantic import OswBaseModel
 from pydantic.v1 import Field, constr
 
-from osw.model.static import OswBaseModel
-
 Entity.update_forward_refs()
 ObjectStatement.update_forward_refs()
 DataStatement.update_forward_refs()