ramodels 36.15.1__tar.gz → 47.6.0__tar.gz

{ramodels-36.15.1 → ramodels-47.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ramodels
-Version: 36.15.1
+Version: 47.6.0
 Summary: Pydantic data models for OS2mo
 Home-page: https://magenta.dk/
 License: MPL-2.0

{ramodels-36.15.1 → ramodels-47.6.0}/pyproject.toml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MPL-2.0
 [tool.poetry]
 name = "ramodels"
-version = "36.15.1"
+version = "47.6.0"
 description = "Pydantic data models for OS2mo"
 authors = ["Magenta <info@magenta.dk>"]
 license = "MPL-2.0"

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/lora/__init__.py

@@ -9,7 +9,6 @@ from .klasse import KlasseRead
 from .organisation import Organisation
 from .organisation import OrganisationRead
 
-
 __all__ = [
     "LoraBase",
     "Facet",

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/mo/_shared.py

@@ -237,7 +237,7 @@ class Validity(OpenValidity):
 class TerminateValidity(OpenValidity):
     to_date: datetime = Field(
         alias="to",
-        description="When the validity should end " "- required when terminating",
+        description="When the validity should end - required when terminating",
     )
 
 

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/mo/class_.py

@@ -31,7 +31,6 @@ class ClassRead(ClassBase):
 
 
 class ClassWrite(ClassBase):
-
     """A MO Class write object."""
 
     name: str = Field(description="Mo-class name.")

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/mo/details/__init__.py

@@ -44,7 +44,6 @@ from .role import RoleDetail
 from .role import RoleRead
 from .role import RoleWrite
 
-
 Details = (
     AssociationDetail
     | EngagementDetail

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/mo/organisation_unit.py

@@ -86,7 +86,7 @@ class OrganisationUnit(MOBase):
     org_unit_type: OrgUnitType = Field(
         description="Reference to the organisation unit type."
     )
-    org_unit_level: OrgUnitLevel = Field(
+    org_unit_level: OrgUnitLevel | None = Field(
         description="Reference to the organisation unit level type."
     )
     details: list[OrgUnitDetails] | None = Field(
@@ -103,10 +103,10 @@ class OrganisationUnit(MOBase):
         user_key: str,
         name: str,
         org_unit_type_uuid: UUID,
-        org_unit_level_uuid: UUID,
         from_date: str,
         uuid: UUID | None = None,
         parent_uuid: UUID | None = None,
+        org_unit_level_uuid: UUID | None = None,
         org_unit_hierarchy_uuid: UUID | None = None,
         to_date: str | None = None,
     ) -> "OrganisationUnit":
@@ -117,6 +117,10 @@ class OrganisationUnit(MOBase):
             if org_unit_hierarchy_uuid
             else None
         )
+        org_unit_level = (
+            OrgUnitLevel(uuid=org_unit_level_uuid) if org_unit_level_uuid else None
+        )
+
         validity = Validity(from_date=from_date, to_date=to_date)
 
         return cls(
@@ -127,7 +131,7 @@ class OrganisationUnit(MOBase):
             parent=parent,
             org_unit_hierarchy=org_unit_hierarchy,
             org_unit_type=OrgUnitType(uuid=org_unit_type_uuid),
-            org_unit_level=OrgUnitLevel(uuid=org_unit_level_uuid),
+            org_unit_level=org_unit_level,
         )
 
 

{ramodels-36.15.1 → ramodels-47.6.0}/setup.py

@@ -18,7 +18,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'ramodels',
-    'version': '36.15.1',
+    'version': '47.6.0',
     'description': 'Pydantic data models for OS2mo',
     'long_description': '<!--\nSPDX-FileCopyrightText: Magenta ApS <https://magenta.dk>\nSPDX-License-Identifier: MPL-2.0\n-->\n\n\n# MoLoRa Data Models\n\nRAModels - MoLoRa data validation models powered by [pydantic](https://github.com/samuelcolvin/pydantic/#pydantic).\n\n## Versioning\nThis project uses [Semantic Versioning](https://semver.org/) with the following strategy:\n- MAJOR: Incompatible changes to existing data models\n- MINOR: Backwards compatible updates to existing data models OR new models added\n- PATCH: Backwards compatible bug fixes\n\n\n## Authors\n\nMagenta ApS <https://magenta.dk>\n\n## License\n- This project: [MPL-2.0](MPL-2.0.txt)\n- Dependencies:\n  - pydantic: [MIT](MIT.txt)\n\nThis project uses [REUSE](https://reuse.software) for licensing. All licenses can be found in the [LICENSES folder](LICENSES/) of the project.\n\n## Development\n### Prerequisites\n\n- [Poetry](https://github.com/python-poetry/poetry)\n- [Pre-commit](https://github.com/pre-commit/pre-commit)\n\n\n### Getting Started\n\n1. Clone the repository:\n`git clone git@git.magenta.dk:rammearkitektur/ra-data-models.git`\n\n2. Install all dependencies:\n`poetry install`\n\n3. Set up pre-commit:\n`pre-commit install`\n\n\n### Running the tests\n\nYou use `poetry` and `pytest` to run the tests:\n\n`poetry run pytest`\n\n\nYou can also run specific files\n\n`poetry run pytest tests/<test_folder>/<test_file.py>`\n\nand even use filtering with `-k`\n\n`poetry run pytest -k "Manager"`\n\n\nYou can use the flags `-vx` where `v` prints the test & `x` makes the test stop if any tests fails (Verbose, X-fail)\n\n### Pre-commit usage\nPre-commit must either be used via your virtual environment or globally.\nIf you want to pre-commit globally, the following extra dependencies are needed:\n`pip install mypy pydantic`\n\n\n### Models\n\n## LoRa\n`LoRa` implements the OIO standard version 1.1. The [standard](https://digitaliser.dk/resource/1569113) with\n[specification](https://www.digitaliser.dk/resource/1569113/artefact/Specifikationafserviceinterfacefororganisation-OIO-Godkendt%5bvs.1.1%5d.pdf?artefact=true&PID=1569586)\n',
     'author': 'Magenta',

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/lora/itsystem.py

@@ -5,13 +5,13 @@ from uuid import UUID
 from pydantic import Field
 
 from ._shared import EffectiveTime
-from ._shared import get_relations
 from ._shared import ITSystemAttributes
 from ._shared import ITSystemProperties
 from ._shared import ITSystemRelations
 from ._shared import ITSystemStates
 from ._shared import ITSystemValidState
 from ._shared import LoraBase
+from ._shared import get_relations
 
 
 class ITSystem(LoraBase):

{ramodels-36.15.1 → ramodels-47.6.0}/ramodels/mo/employee.py

@@ -9,15 +9,15 @@ from pydantic import Field
 from pydantic import root_validator
 from pydantic import validator
 
+from ramodels.base import RABase
+from ramodels.base import tz_isodate
+
 from ._shared import MOBase
 from ._shared import OpenValidity
 from ._shared import OrganisationRef
 from ._shared import validate_cpr
 from ._shared import validate_names
 from .details import EmployeeDetails
-from ramodels.base import RABase
-from ramodels.base import tz_isodate
-
 
 # Type aliases
 DictStrAny = dict[str, Any]