orchestrator-core 3.1.2rc3__tar.gz → 3.1.2rc4__tar.gz

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.2rc3
+current_version = 3.1.2rc4
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestrator-core
-Version: 3.1.2rc3
+Version: 3.1.2rc4
 Summary: This is the orchestrator workflow engine.
 Requires-Python: >=3.11,<3.14
 Classifier: Intended Audience :: Information Technology
@@ -39,7 +39,7 @@ Requires-Dist: more-itertools~=10.6.0
 Requires-Dist: itsdangerous
 Requires-Dist: Jinja2==3.1.6
 Requires-Dist: orjson==3.10.15
-Requires-Dist: psycopg[binary]==3.2.6
+Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: pydantic[email]~=2.8.2
 Requires-Dist: pydantic-settings~=2.8.0
 Requires-Dist: python-dateutil==2.8.2
@@ -47,7 +47,7 @@ Requires-Dist: python-rapidjson>=1.18,<1.21
 Requires-Dist: pytz==2025.1
 Requires-Dist: redis==5.1.1
 Requires-Dist: schedule==1.1.0
-Requires-Dist: sentry-sdk[fastapi]~=2.22.0
+Requires-Dist: sentry-sdk[fastapi]~=2.24.0
 Requires-Dist: SQLAlchemy==2.0.39
 Requires-Dist: SQLAlchemy-Utils==0.41.2
 Requires-Dist: structlog

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/docs/getting-started/versions.md

@@ -5,7 +5,7 @@ The orchestrator backend has the following requirements
 For the backend you need the following packages:
 
 * Python >= 3.11
-* Postgres >= 14
+* Postgres >= 15
 
 ### Optional dependencies
 * Redis

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/docs/workshops/beginner/macos.md

@@ -10,14 +10,14 @@ This installation instruction assumes the use of [Homebrew](https://brew.sh/).
 The following software dependencies need to be installed:
 
 * Python 3.11
-* PostgreSQL (version >=11)
+* Postgres >= 15
 * virtualenvwrapper (or use any other tool to create virtual Python
   environments)
 * Node.js (version 14)
 * yarn
 
 ``` shell
-brew install python@3.11 postgresql@13 virtualenvwrapper node@14 yarn
+brew install python@3.11 postgresql@15 virtualenvwrapper node@14 yarn
 ```
 
 ### Step 2 - Database setup
@@ -26,7 +26,7 @@ Start the database server and create the database with the following commands,
 use `nwa` as password:
 
 ``` shell
-brew services start postgresql@13
+brew services start postgresql@15
 createuser -sP nwa
 createdb orchestrator-core -O nwa
 ```

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,7 +13,7 @@
 
 """This is the orchestrator workflow engine."""
 
-__version__ = "3.1.2rc3"
+__version__ = "3.1.2rc4"
 
 from orchestrator.app import OrchestratorCore
 from orchestrator.settings import app_settings

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/api/api_v1/api.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/api/api_v1/endpoints/processes.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/api/api_v1/endpoints/settings.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/api/api_v1/endpoints/subscriptions.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/app.py

@@ -5,7 +5,7 @@ This module contains the main `OrchestratorCore` class for the `FastAPI` backend
 provides the ability to run the CLI.
 """
 
-# Copyright 2019-2020 SURF, ESnet
+# Copyright 2019-2020 SURF, ESnet, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/cli/database.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF, ESnet
+# Copyright 2019-2025 SURF, ESnet, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/cli/generator/generator/migration.py

@@ -31,16 +31,13 @@ from orchestrator.cli.generator.generator.helpers import (
     sort_product_blocks_by_dependencies,
 )
 from orchestrator.cli.generator.generator.settings import product_generator_settings as settings
-from orchestrator.settings import convert_database_uri
 
 logger = structlog.getLogger(__name__)
 
 
 def create_migration_file(message: str, head: str) -> Path | None:
-    if environ.get("DATABASE_URI"):
-        environ.update({"DATABASE_URI": convert_database_uri(environ["DATABASE_URI"])})
-    else:
-        environ.update({"DATABASE_URI": "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core"})
+    if not environ.get("DATABASE_URI"):
+        environ.update({"DATABASE_URI": "postgresql://nwa:nwa@localhost/orchestrator-core"})
     if not environ.get("PYTHONPATH"):
         environ.update({"PYTHONPATH": "."})
     logger.info(

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/cli/migrate_tasks.py

@@ -1,3 +1,16 @@
+# Copyright 2019-2025 SURF, GÉANT.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import itertools
 import operator
 from collections.abc import Iterable

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/config/assignee.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/db/models.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/devtools/populator.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/domain/__init__.py

@@ -11,11 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from orchestrator.domain.base import SubscriptionModel
+from orchestrator.domain.base import SubscriptionModel, SubscriptionModelRegistry
 from orchestrator.utils.docs import make_product_type_index_doc
 
-SUBSCRIPTION_MODEL_REGISTRY: dict[str, type[SubscriptionModel]] = {}
+SUBSCRIPTION_MODEL_REGISTRY: SubscriptionModelRegistry = SubscriptionModelRegistry()
 
 __doc__ = make_product_type_index_doc(SUBSCRIPTION_MODEL_REGISTRY)
 

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/domain/base.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF, ESnet.
+# Copyright 2019-2025 SURF, ESnet, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,14 +12,16 @@
 # limitations under the License.
 import itertools
 from collections import defaultdict
-from collections.abc import Callable, Iterable
 from datetime import datetime
-from inspect import get_annotations
+from inspect import get_annotations, isclass
 from itertools import groupby, zip_longest
 from operator import attrgetter
 from typing import (
     Any,
+    Callable,
     ClassVar,
+    Iterable,
+    Mapping,
     Optional,
     TypeVar,
     Union,
@@ -596,7 +598,9 @@ class ProductBlockModel(DomainModel):
         product_blocks_in_model = cls._get_depends_on_product_block_types()
         product_blocks_types_in_model = get_depends_on_product_block_type_list(product_blocks_in_model)
 
-        product_blocks_in_model = set(flatten(map(attrgetter("__names__"), product_blocks_types_in_model)))  # type: ignore
+        product_blocks_in_model = set(
+            flatten(map(attrgetter("__names__"), product_blocks_types_in_model))
+        )  # type: ignore
 
         missing_product_blocks_in_db = product_blocks_in_model - product_blocks_in_db  # type: ignore
         missing_product_blocks_in_model = product_blocks_in_db - product_blocks_in_model  # type: ignore
@@ -1051,7 +1055,9 @@ class SubscriptionModel(DomainModel):
         product_blocks_in_model = cls._get_depends_on_product_block_types()
         product_blocks_types_in_model = get_depends_on_product_block_type_list(product_blocks_in_model)
 
-        product_blocks_in_model = set(flatten(map(attrgetter("__names__"), product_blocks_types_in_model)))  # type: ignore
+        product_blocks_in_model = set(
+            flatten(map(attrgetter("__names__"), product_blocks_types_in_model))
+        )  # type: ignore
 
         missing_product_blocks_in_db = product_blocks_in_model - product_blocks_in_db  # type: ignore
         missing_product_blocks_in_model = product_blocks_in_db - product_blocks_in_model  # type: ignore
@@ -1402,6 +1408,69 @@ class SubscriptionModel(DomainModel):
         return self._db_model
 
 
+def validate_base_model(
+    name: str, cls: type[Any], base_model: type[BaseModel] = DomainModel, errors: list[str] | None = None
+) -> None:
+    """Validates that the given class is not Pydantic BaseModel or its direct subclass."""
+    # Instantiate errors list if not provided and avoid mutating default
+    if errors is None:
+        errors = []
+    # Return early when the node is not a class as there is nothing to be done
+    if not isclass(cls):
+        return
+    # Validate each field in the ProductBlockModel's field dictionaries
+    if issubclass(cls, ProductBlockModel) or issubclass(cls, SubscriptionModel):
+        for name, clz in cls._product_block_fields_.items():
+            validate_base_model(name, clz, ProductBlockModel, errors)
+        for name, clz in cls._non_product_block_fields_.items():
+            validate_base_model(name, clz, SubscriptionModel, errors)
+    # Generate error if node is Pydantic BaseModel or direct subclass
+    if issubclass(cls, BaseModel):
+        err_msg: str = (
+            f"If this field was intended to be a {base_model.__name__}, define {name}:{cls.__name__} with "
+            f"{base_model.__name__} as its superclass instead. e.g., class {cls.__name__}({base_model.__name__}):"
+        )
+        if cls is BaseModel:
+            errors.append(f"Field {name}: {cls.__name__} can not be {BaseModel.__name__}. " + err_msg)
+        if len(cls.__mro__) > 1 and cls.__mro__[1] is BaseModel:
+            errors.append(
+                f"Field {name}: {cls.__name__} can not be a direct subclass of {BaseModel.__name__}. " + err_msg
+            )
+    # Format all errors as one per line and raise a TypeError when they exist
+    if errors:
+        raise TypeError("\n".join(errors))
+
+
+class SubscriptionModelRegistry(dict[str, type[SubscriptionModel]]):
+    """A registry for all subscription models."""
+
+    def __setitem__(self, __key: str, __value: type[SubscriptionModel]) -> None:
+        """Set value for key in while validating against Pydantic BaseModel."""
+        validate_base_model(__key, __value)
+        super().__setitem__(__key, __value)
+
+    def update(
+        self,
+        m: Any = None,
+        /,
+        **kwargs: type[SubscriptionModel],
+    ) -> None:
+        """Update dictionary with mapping and/or kwargs using `__setitem__`."""
+        if m:
+            if isinstance(m, Mapping):
+                for key, value in m.items():
+                    self[key] = value
+            elif isinstance(m, Iterable):
+                for index, item in enumerate(m):
+                    try:
+                        key, value = item
+                    except ValueError:
+                        raise TypeError(f"dictionary update sequence element #{index} is not an iterable of length 2")
+                    self[key] = value
+        for key, value in kwargs.items():
+            self[key] = value
+
+
 def _validate_lifecycle_change_for_product_block(
     used_by: SubscriptionInstanceTable,
     product_block_model: ProductBlockModel,

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/domain/lifecycle.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/graphql/schema.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 SURF.
+# Copyright 2022-2023 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/graphql/types.py

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 SURF.
+# Copyright 2022-2023 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/graphql/utils/get_subscription_product_blocks.py

@@ -1,3 +1,16 @@
+# Copyright 2022-2023 SURF, GÉANT.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from collections.abc import Generator
 from itertools import count
 from typing import TYPE_CHECKING, Annotated, Any

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/migrations/env.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/migrations/helpers.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -880,10 +880,10 @@ def delete_product(conn: sa.engine.Connection, name: str) -> None:
                 RETURNING  product_id
             ),
             deleted_p_pb AS (
-                DELETE FROM product_product_blocks WHERE product_id = ANY(SELECT product_id FROM deleted_p)
+                DELETE FROM product_product_blocks WHERE product_id IN (SELECT product_id FROM deleted_p)
             ),
             deleted_pb_rt AS (
-                DELETE FROM products_workflows WHERE product_id = ANY(SELECT product_id FROM deleted_p)
+                DELETE FROM products_workflows WHERE product_id IN (SELECT product_id FROM deleted_p)
             )
             SELECT * from deleted_p;
             """
@@ -911,10 +911,10 @@ def delete_product_block(conn: sa.engine.Connection, name: str) -> None:
                 RETURNING  product_block_id
             ),
             deleted_p_pb AS (
-                DELETE FROM product_product_blocks WHERE product_block_id =ANY(SELECT product_block_id FROM deleted_pb)
+                DELETE FROM product_product_blocks WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb)
             ),
             deleted_pb_rt AS (
-                DELETE FROM product_block_resource_types WHERE product_block_id =ANY(SELECT product_block_id FROM deleted_pb)
+                DELETE FROM product_block_resource_types WHERE product_block_id IN (SELECT product_block_id FROM deleted_pb)
             )
             SELECT * from deleted_pb;
             """
@@ -968,7 +968,7 @@ def delete_resource_type(conn: sa.engine.Connection, resource_type: str) -> None
                 RETURNING  resource_type_id
             ),
             deleted_pb_rt AS (
-                DELETE FROM product_block_resource_types WHERE resource_type_id =ANY(SELECT resource_type_id FROM deleted_pb)
+                DELETE FROM product_block_resource_types WHERE resource_type_id IN (SELECT resource_type_id FROM deleted_pb)
             )
             SELECT * from deleted_pb;
             """

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/schemas/engine_settings.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/schemas/subscription.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/security.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/services/celery.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/services/processes.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/services/products.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/services/subscriptions.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/services/tasks.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/settings.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,7 +13,6 @@
 
 import secrets
 import string
-import warnings
 from pathlib import Path
 from typing import Literal
 
@@ -24,10 +23,6 @@ from oauth2_lib.settings import oauth2lib_settings
 from pydantic_forms.types import strEnum
 
 
-class OrchestratorDeprecationWarning(DeprecationWarning):
-    pass
-
-
 class ExecutorType(strEnum):
     WORKER = "celery"
     THREADPOOL = "threadpool"
@@ -54,7 +49,7 @@ class AppSettings(BaseSettings):
     EXECUTOR: str = ExecutorType.THREADPOOL
     WORKFLOWS_SWAGGER_HOST: str = "localhost"
     WORKFLOWS_GUI_URI: str = "http://localhost:3000"
-    DATABASE_URI: PostgresDsn = "postgresql+psycopg://nwa:nwa@localhost/orchestrator-core"  # type: ignore
+    DATABASE_URI: PostgresDsn = "postgresql://nwa:nwa@localhost/orchestrator-core"  # type: ignore
     MAX_WORKERS: int = 5
     MAIL_SERVER: str = "localhost"
     MAIL_PORT: int = 25
@@ -93,22 +88,6 @@ class AppSettings(BaseSettings):
     VALIDATE_OUT_OF_SYNC_SUBSCRIPTIONS: bool = False
     FILTER_BY_MODE: Literal["partial", "exact"] = "exact"
 
-    def __init__(self) -> None:
-        super(AppSettings, self).__init__()
-        self.DATABASE_URI = PostgresDsn(convert_database_uri(str(self.DATABASE_URI)))
-
-
-def convert_database_uri(db_uri: str) -> str:
-    if db_uri.startswith(("postgresql://", "postgresql+psycopg2://")):
-        db_uri = "postgresql+psycopg" + db_uri[db_uri.find("://") :]
-        warnings.filterwarnings("always", category=OrchestratorDeprecationWarning)
-        warnings.warn(
-            "DATABASE_URI converted to postgresql+psycopg:// format, please update your enviroment variable",
-            OrchestratorDeprecationWarning,
-            stacklevel=2,
-        )
-    return db_uri
-
 
 app_settings = AppSettings()
 

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/targets.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/types.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/utils/errors.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/utils/state.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF, ESnet
+# Copyright 2019-2020 SURF, ESnet, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/websocket/websocket_manager.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflow.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2025 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/modify_note.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/steps.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/tasks/cleanup_tasks_log.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/tasks/resume_workflows.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/tasks/validate_product_type.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2024 SURF.
+# Copyright 2019-2024 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/tasks/validate_products.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

{orchestrator_core-3.1.2rc3 → orchestrator_core-3.1.2rc4}/orchestrator/workflows/utils.py

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 SURF.
+# Copyright 2019-2020 SURF, GÉANT.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at