diff --git a/pyoaev/client.py b/pyoaev/client.py index a86a76b..450e99d 100644 --- a/pyoaev/client.py +++ b/pyoaev/client.py @@ -1,5 +1,6 @@ from typing import TYPE_CHECKING, Any, BinaryIO, Dict, List, Optional, Union from urllib import parse +from uuid import UUID import requests @@ -23,6 +24,7 @@ def __init__( pagination: Optional[str] = None, order_by: Optional[str] = None, ssl_verify: Union[bool, str] = True, + tenant_id: Optional[UUID] = None, **kwargs: Any, ) -> None: @@ -32,6 +34,7 @@ def __init__( raise ValueError("A TOKEN must be set") self.url = url + self.tenant_id = tenant_id self.timeout = timeout #: Headers that will be used in request to OpenAEV self.headers = { @@ -109,9 +112,14 @@ def _build_url(self, path: str) -> str: Returns: The full URL """ - if path.startswith("http://") or path.startswith("https://"): + if parse.urlparse(path).scheme in ("http", "https"): return path - return f"{self.url}/api{path}" + base_url = self.url.rstrip("/") + normalized_path = path.lstrip("/") + if self.tenant_id: + return f"{base_url}/api/tenants/{self.tenant_id}/{normalized_path}" + else: + return f"{base_url}/api/{normalized_path}" def _get_session_opts(self) -> Dict[str, Any]: return { diff --git a/pyoaev/configuration/settings_loader.py b/pyoaev/configuration/settings_loader.py index 8d41e4f..8e4dcdc 100644 --- a/pyoaev/configuration/settings_loader.py +++ b/pyoaev/configuration/settings_loader.py @@ -3,6 +3,7 @@ from datetime import timedelta from pathlib import Path from typing import Annotated, Literal +from uuid import UUID from pydantic import BaseModel, ConfigDict, Field, HttpUrl, PlainSerializer from pydantic_settings import ( @@ -99,6 +100,11 @@ class ConfigLoaderOAEV(BaseConfigModel): token: str = Field( description="The token for the OpenAEV platform.", ) + tenant_id: UUID | None = Field( + default=None, + description="Identifier of the tenant within the OpenAEV platform. Used in multi-tenant environments to scope " + "API requests and ensure data isolation between different tenants.", + ) class ConfigLoaderCollector(BaseConfigModel): diff --git a/pyoaev/daemons/base_daemon.py b/pyoaev/daemons/base_daemon.py index 7dcc4e4..9728a87 100644 --- a/pyoaev/daemons/base_daemon.py +++ b/pyoaev/daemons/base_daemon.py @@ -2,6 +2,7 @@ from abc import ABC, abstractmethod from inspect import signature from types import FunctionType +from uuid import UUID from pyoaev.client import OpenAEV from pyoaev.configuration import Configuration @@ -37,6 +38,7 @@ def __init__( self.api = api_client or BaseDaemon.__get_default_api_client( url=self._configuration.get("openaev_url"), token=self._configuration.get("openaev_token"), + tenant_id=self._configuration.get("openaev_tenant_id"), ) # logging @@ -131,8 +133,8 @@ def get_id(self): ) @classmethod - def __get_default_api_client(cls, url, token): - return OpenAEV(url=url, token=token) + def __get_default_api_client(cls, url, token, tenant_id: UUID | None): + return OpenAEV(url=url, token=token, tenant_id=tenant_id) @classmethod def __get_default_logger(cls, log_level, name): diff --git a/pyoaev/helpers.py b/pyoaev/helpers.py index a422151..a85971e 100644 --- a/pyoaev/helpers.py +++ b/pyoaev/helpers.py @@ -322,6 +322,7 @@ def __init__(self, config: OpenAEVConfigHelper, icon) -> None: self.api = OpenAEV( url=config.get_conf("openaev_url"), token=config.get_conf("openaev_token"), + tenant_id=config.get_conf("openaev_tenant_id"), ) # Get the mq configuration from api self.config = { diff --git a/pyoaev/utils.py b/pyoaev/utils.py index c620152..5d922f2 100644 --- a/pyoaev/utils.py +++ b/pyoaev/utils.py @@ -186,6 +186,7 @@ def __init__(self, api, config, logger, ping_type) -> None: threading.Thread.__init__(self) self.ping_type = ping_type self.api = api + self.tenant_id = getattr(self.api, "tenant_id", None) self.config = config self.logger = logger self.in_error = False @@ -203,9 +204,15 @@ def ping(self) -> None: self.exit_event.wait(40) def run(self) -> None: - self.logger.info("Starting PingAlive thread") + self.logger.info( + "Starting PingAlive thread", + {"tenant_id": str(self.tenant_id) if self.tenant_id else None}, + ) self.ping() def stop(self) -> None: - self.logger.info("Preparing PingAlive for clean shutdown") + self.logger.info( + "Preparing PingAlive for clean shutdown", + {"tenant_id": str(self.tenant_id) if self.tenant_id else None}, + ) self.exit_event.set() diff --git a/test/bdd/constraints/multi_tenant_api_routing_constraint.feature b/test/bdd/constraints/multi_tenant_api_routing_constraint.feature new file mode 100644 index 0000000..ccfbf54 --- /dev/null +++ b/test/bdd/constraints/multi_tenant_api_routing_constraint.feature @@ -0,0 +1,12 @@ +Feature: URL normalization in OpenAEV client + + Scenario Outline: URL normalization combines base_url and path correctly + Given an OpenAEV client with base_url "" + When I build the URL for "" + Then the resulting URL should be "" + + Examples: + | base_url | path | expected | + | base_url | path | base_url/api/path | + | base_url/ | /path | base_url/api/path | + | base_url// | //path | base_url/api/path | \ No newline at end of file diff --git a/test/bdd/constraints/multi_tenant_validation_uuid_constraint.feature b/test/bdd/constraints/multi_tenant_validation_uuid_constraint.feature new file mode 100644 index 0000000..027f07f --- /dev/null +++ b/test/bdd/constraints/multi_tenant_validation_uuid_constraint.feature @@ -0,0 +1,30 @@ +Feature: Tenant ID handling in OpenAEV configuration + + Scenario: tenant_id is not provided + Given a configuration without tenant_id + When the configuration is loaded + Then tenant_id should be None + + + Scenario: tenant_id is explicitly set to None + Given a configuration with tenant_id set to None + When the configuration is loaded + Then tenant_id should be None + + + Scenario Outline: tenant_id is invalid and should raise a validation error + Given a configuration with tenant_id "" invalid + When the configuration is loaded + Then a validation error should be raised + + Examples: + | tenant_id | + | ChangeMe | + | "" | + | 550-e29-41d-a71-446 | + + + Scenario: tenant_id is a valid UUID + Given a configuration with tenant_id "2cffad3a-0001-4078-b0e2-ef74274022c3" + When the configuration is loaded + Then tenant_id should be a valid UUID \ No newline at end of file diff --git a/test/bdd/constraints/test_multi_tenant_api_routing_constraint.py b/test/bdd/constraints/test_multi_tenant_api_routing_constraint.py new file mode 100644 index 0000000..3956afb --- /dev/null +++ b/test/bdd/constraints/test_multi_tenant_api_routing_constraint.py @@ -0,0 +1,63 @@ +"""URL normalization in OpenAEV client feature tests.""" + +import pytest +from pytest_bdd import given, parsers, scenario, then, when + +from pyoaev import OpenAEV + +# -------------------------------------------------- +# SCENARIOS +# -------------------------------------------------- + + +@scenario( + "multi_tenant_api_routing_constraint.feature", + "URL normalization combines base_url and path correctly", +) +def test_url_normalization(): + pass + + +# -------------------------------------------------- +# FIXTURE CONTEXT +# -------------------------------------------------- + + +@pytest.fixture +def context(): + return {} + + +# -------------------------------------------------- +# GIVEN +# -------------------------------------------------- + + +@given(parsers.parse('an OpenAEV client with base_url "{base_url}"')) +def client(context, base_url): + context["client"] = OpenAEV( + url=base_url, + token="token", + tenant_id=None, + ) + + +# -------------------------------------------------- +# WHEN +# -------------------------------------------------- + + +@when(parsers.parse('I build the URL for "{path}"')) +def build_url(context, path): + client = context["client"] + context["result"] = client._build_url(path) + + +# -------------------------------------------------- +# THEN +# -------------------------------------------------- + + +@then(parsers.parse('the resulting URL should be "{expected}"')) +def check_url(context, expected): + assert context["result"] == expected diff --git a/test/bdd/constraints/test_multi_tenant_validation_uuid_constraint.py b/test/bdd/constraints/test_multi_tenant_validation_uuid_constraint.py new file mode 100644 index 0000000..df866e5 --- /dev/null +++ b/test/bdd/constraints/test_multi_tenant_validation_uuid_constraint.py @@ -0,0 +1,132 @@ +"""Tenant ID handling in OpenAEV configuration feature tests.""" + +from uuid import UUID + +from pydantic import ValidationError +from pytest_bdd import given, parsers, scenario, then, when + +from pyoaev.configuration.settings_loader import ConfigLoaderOAEV + +# -------------------------------------------------- +# SCENARIOS +# -------------------------------------------------- + + +@scenario( + "multi_tenant_validation_uuid_constraint.feature", + "tenant_id is a valid UUID", +) +def test_tenant_id_is_a_valid_uuid(): + pass + + +@scenario( + "multi_tenant_validation_uuid_constraint.feature", + "tenant_id is explicitly set to None", +) +def test_tenant_id_is_explicitly_set_to_none(): + pass + + +@scenario( + "multi_tenant_validation_uuid_constraint.feature", + "tenant_id is invalid and should raise a validation error", +) +def test_tenant_id_is_invalid_and_should_raise_a_validation_error(): + pass + + +@scenario( + "multi_tenant_validation_uuid_constraint.feature", + "tenant_id is not provided", +) +def test_tenant_id_is_not_provided(): + pass + + +# -------------------------------------------------- +# GIVEN +# -------------------------------------------------- + + +@given( + "a configuration without tenant_id", + target_fixture="config", +) +def config_without(): + return { + "url": "https://example.com", + "token": "token", + } + + +@given( + "a configuration with tenant_id set to None", + target_fixture="config", +) +def config_none(): + return { + "url": "https://example.com", + "token": "token", + "tenant_id": None, + } + + +@given( + parsers.parse('a configuration with tenant_id "{tenant_id}" invalid'), + target_fixture="config", +) +def config_with_tenant_invalid(tenant_id): + return { + "url": "https://example.com", + "token": "token", + "tenant_id": tenant_id, + } + + +@given( + 'a configuration with tenant_id "2cffad3a-0001-4078-b0e2-ef74274022c3"', + target_fixture="config", +) +def config_with_tenant_valid(): + return { + "url": "https://example.com", + "token": "token", + "tenant_id": "2cffad3a-0001-4078-b0e2-ef74274022c3", + } + + +# -------------------------------------------------- +# WHEN +# -------------------------------------------------- + + +@when( + "the configuration is loaded", + target_fixture="result", +) +def load_config(config): + try: + return ConfigLoaderOAEV(**config) + except ValidationError as err: + return err + + +# -------------------------------------------------- +# THEN +# -------------------------------------------------- + + +@then("tenant_id should be None") +def assert_none(result): + assert result.tenant_id is None + + +@then("tenant_id should be a valid UUID") +def assert_uuid(result): + assert isinstance(result.tenant_id, UUID) + + +@then("a validation error should be raised") +def assert_validation_error(result): + assert isinstance(result, ValidationError) diff --git a/test/bdd/features/multi_tenant_api_routing.feature b/test/bdd/features/multi_tenant_api_routing.feature new file mode 100644 index 0000000..fb15e07 --- /dev/null +++ b/test/bdd/features/multi_tenant_api_routing.feature @@ -0,0 +1,17 @@ +Feature: Multi-tenant API routing in OpenAEV client + + Scenario: Full URL bypasses tenant routing + Given an OpenAEV client with any tenant configuration + When I build the URL for "https://external.service/api/path" + Then the resulting URL should be "https://external.service/api/path" + + + Scenario Outline: Relative path routing depends on tenant configuration + Given an OpenAEV client with tenant_id "" + When I build the URL for "/path" + Then the resulting URL should be "" + + Examples: + | tenant_id | output | + | None | base_url/api/path | + | 2cffad3a-0001-4078-b0e2-ef74274022c3 | base_url/api/tenants/2cffad3a-0001-4078-b0e2-ef74274022c3/path | diff --git a/test/bdd/features/multi_tenant_base_daemon_propagation.feature b/test/bdd/features/multi_tenant_base_daemon_propagation.feature new file mode 100644 index 0000000..69bc76c --- /dev/null +++ b/test/bdd/features/multi_tenant_base_daemon_propagation.feature @@ -0,0 +1,12 @@ +Feature: Tenant propagation in BaseDaemon API client initialization + + Scenario Outline: BaseDaemon propagates tenant_id correctly from configuration + Given a daemon configuration with "" + When the BaseDaemon is initialized + Then the API client should be created with tenant_id "" + + Examples: + | tenant_case | expected_tenant_id | + | missing_key | None | + | explicit_none | None | + | valid_uuid | 2cffad3a-0001-4078-b0e2-ef74274022c3 | \ No newline at end of file diff --git a/test/bdd/features/multi_tenant_endpoint_search_targets.feature b/test/bdd/features/multi_tenant_endpoint_search_targets.feature new file mode 100644 index 0000000..e30bd66 --- /dev/null +++ b/test/bdd/features/multi_tenant_endpoint_search_targets.feature @@ -0,0 +1,12 @@ +Feature: searchTargets API routing with and without tenant_id + + Scenario Outline: searchTargets routing behavior + Given an OpenAEV client with tenant_id "" + And a valid SearchPaginationInput + When I call searchTargets on endpoint + Then the request URL should be "" + + Examples: + | tenant_id | expected_url | + | None | url/api/endpoints/targets | + | 2cffad3a-0001-4078-b0e2-ef74274022c3 | url/api/tenants/2cffad3a-0001-4078-b0e2-ef74274022c3/endpoints/targets | \ No newline at end of file diff --git a/test/bdd/features/test_multi_tenant_api_routing.py b/test/bdd/features/test_multi_tenant_api_routing.py new file mode 100644 index 0000000..8e6e2b1 --- /dev/null +++ b/test/bdd/features/test_multi_tenant_api_routing.py @@ -0,0 +1,81 @@ +from uuid import UUID + +from pytest_bdd import given, parsers, scenario, then, when + +from pyoaev import OpenAEV + +# -------------------------------------------------- +# SCENARIOS +# -------------------------------------------------- + + +@scenario( + "multi_tenant_api_routing.feature", + "Full URL bypasses tenant routing", +) +def test_full_url_bypasses_tenant_routing(): + pass + + +@scenario( + "multi_tenant_api_routing.feature", + "Relative path routing depends on tenant configuration", +) +def test_relative_path_routing(): + pass + + +# -------------------------------------------------- +# GIVEN +# -------------------------------------------------- + + +@given( + "an OpenAEV client with any tenant configuration", + target_fixture="client", +) +def client_any(): + return OpenAEV( + "base_url", + "token", + tenant_id=None, + ) + + +@given( + parsers.parse('an OpenAEV client with tenant_id "{tenant_id}"'), + target_fixture="client", +) +def client_with_tenant(tenant_id): + if tenant_id is None or tenant_id == "None": + tenant_id_value = None + else: + tenant_id_value = UUID(tenant_id) + return OpenAEV( + "base_url", + "token", + tenant_id=tenant_id_value, + ) + + +# -------------------------------------------------- +# WHEN +# -------------------------------------------------- + + +@when( + parsers.parse('I build the URL for "{path}"'), + target_fixture="result", +) +def build_url(client, path): + return client._build_url(path) + + +# -------------------------------------------------- +# THEN +# -------------------------------------------------- + + +@then(parsers.parse('the resulting URL should be "{output}"')) +def assert_url(result, output): + assert result == output diff --git a/test/bdd/features/test_multi_tenant_base_daemon_propagation.py b/test/bdd/features/test_multi_tenant_base_daemon_propagation.py new file mode 100644 index 0000000..ca85f22 --- /dev/null +++ b/test/bdd/features/test_multi_tenant_base_daemon_propagation.py @@ -0,0 +1,120 @@ +from unittest.mock import MagicMock +from uuid import UUID + +import pytest +from pytest_bdd import given, parsers, scenario, then, when + +from pyoaev.daemons.base_daemon import BaseDaemon + +# -------------------------------------------------- +# SCENARIO +# -------------------------------------------------- + + +@scenario( + "multi_tenant_base_daemon_propagation.feature", + "BaseDaemon propagates tenant_id correctly from configuration", +) +def test_base_daemon_propagates_tenant_id(): + pass + + +# -------------------------------------------------- +# FIXTURE CONTEXT +# -------------------------------------------------- + + +@pytest.fixture +def context(): + return {} + + +# -------------------------------------------------- +# HELPERS +# -------------------------------------------------- + + +def build_config(tenant_case): + base = { + "openaev_url": "url", + "openaev_token": "token", + } + + if tenant_case == "missing_key": + return base + + if tenant_case == "explicit_none": + base["openaev_tenant_id"] = None + return base + + if tenant_case == "valid_uuid": + base["openaev_tenant_id"] = UUID("2cffad3a-0001-4078-b0e2-ef74274022c3") + return base + return base + + +# -------------------------------------------------- +# GIVEN +# -------------------------------------------------- + + +@given(parsers.parse('a daemon configuration with "{tenant_case}"')) +def daemon_config(context, monkeypatch, tenant_case): + captured = {} + config_map = build_config(tenant_case) + + def _fake_client(url, token, tenant_id=None): + captured["url"] = url + captured["token"] = token + captured["tenant_id"] = tenant_id + return MagicMock() + + mock_client = MagicMock(side_effect=_fake_client) + monkeypatch.setattr("pyoaev.daemons.base_daemon.OpenAEV", mock_client) + context["mock_client"] = mock_client + + config = MagicMock() + config.get.side_effect = lambda key: config_map.get(key) + + context["config"] = config + context["captured"] = captured + + +# -------------------------------------------------- +# WHEN +# -------------------------------------------------- + + +@when("the BaseDaemon is initialized") +def init_daemon(context): + class DummyDaemon(BaseDaemon): + def _setup(self): + pass + + def _start_loop(self): + pass + + context["daemon"] = DummyDaemon(configuration=context["config"]) + + +# -------------------------------------------------- +# THEN +# -------------------------------------------------- + + +@then( + parsers.parse( + 'the API client should be created with tenant_id "{expected_tenant_id}"' + ) +) +def check_tenant(context, expected_tenant_id): + captured = context["captured"] + + mock_client = context["mock_client"] + assert mock_client.call_count == 1 + + assert captured["url"] == "url" + assert captured["token"] == "token" + + expected = None if expected_tenant_id == "None" else UUID(expected_tenant_id) + assert captured["tenant_id"] == expected diff --git a/test/bdd/features/test_multi_tenant_endpoint_search_targets.py b/test/bdd/features/test_multi_tenant_endpoint_search_targets.py new file mode 100644 index 0000000..081364c --- /dev/null +++ b/test/bdd/features/test_multi_tenant_endpoint_search_targets.py @@ -0,0 +1,127 @@ +from unittest.mock import MagicMock +from uuid import UUID + +import pytest +from pytest_bdd import given, parsers, scenario, then, when + +from pyoaev import OpenAEV +from pyoaev.apis.inputs.search import Filter, FilterGroup, SearchPaginationInput + + +# -------------------------------------------------- +# SCENARIO +# -------------------------------------------------- +@scenario( + "multi_tenant_endpoint_search_targets.feature", + "searchTargets routing behavior", +) +def test_search_targets_routing(): + pass + + +# -------------------------------------------------- +# FIXTURE CONTEXT +# -------------------------------------------------- + + +@pytest.fixture +def context(): + return {} + + +# -------------------------------------------------- +# HELPERS +# -------------------------------------------------- + + +class MockResponse: + def __init__(self, json_data=None, status_code=200): + self._json_data = json_data + self.status_code = status_code + self.history = None + self.content = None + self.headers = {"Content-Type": "application/json"} + + def json(self): + return self._json_data or {} + + +def build_search_input(): + return SearchPaginationInput( + 0, + 20, + FilterGroup( + "or", + [ + Filter( + "targets", + "and", + "eq", + ["target_1", "target_2", "target_3"], + ) + ], + ), + None, + None, + ) + + +# -------------------------------------------------- +# GIVEN +# -------------------------------------------------- + + +@given(parsers.parse('an OpenAEV client with tenant_id "{tenant_id}"')) +def client(context, monkeypatch, tenant_id): + captured = {} + + def _fake_request(method, url, **kwargs): + captured["method"] = method + captured["url"] = url + captured["json"] = kwargs.get("json") + return MockResponse() + + mock_request = MagicMock(side_effect=_fake_request) + monkeypatch.setattr("requests.Session.request", mock_request) + context["mock_request"] = mock_request + + context["tenant_id"] = None if tenant_id == "None" else UUID(tenant_id) + context["captured"] = captured + + +@given("a valid SearchPaginationInput") +def search_input(context): + context["search_input"] = build_search_input() + + +# -------------------------------------------------- +# WHEN +# -------------------------------------------------- + + +@when("I call searchTargets on endpoint") +def call_search_targets(context): + api_client = OpenAEV( + "url", + "token", + tenant_id=context["tenant_id"], + ) + + api_client.endpoint.searchTargets(context["search_input"]) + + +# -------------------------------------------------- +# THEN +# -------------------------------------------------- + + +@then(parsers.parse('the request URL should be "{expected_url}"')) +def check_request(context, expected_url): + captured = context["captured"] + search_input = context["search_input"] + mock_request = context["mock_request"] + + assert mock_request.call_count == 1 + assert captured["method"] == "post" + assert captured["url"] == expected_url + assert captured["json"] == search_input.to_dict()