From 29ef34ebd241d244c00838b46b7147987e787732 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 10:24:14 +0200 Subject: [PATCH 1/8] Update cryptography and urllib3 versions in requirements.txt The project dependencies cryptography and urllib3 have been updated to more recent versions in the requirements.txt file. Cryptography has been updated from 3.4.8 to 42.0.5 while urllib3 has been updated from 1.26.7 to 2.2.1. --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b34c988..077fec8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,11 @@ pytest==6.2.5 black==21.9b0 flake8==3.9.2 pyflakes==2.3.1 -cryptography~=3.4.8 +cryptography~=42.0.5 setuptools~=68.0.0 pycparser~=2.20 idna~=3.2 -urllib3~=1.26.7 +urllib3~=2.2.1 certifi~=2023.7.22 requests~=2.31.0 paho-mqtt~=1.5.1 From 2e6482145f790c16bbc2cf088b1fccdf221a1bb6 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 10:27:13 +0200 Subject: [PATCH 2/8] Update cryptography and urllib3 versions in requirements Updated the cryptography from version 42.0.5 to version 3.4.8 and urllib3 from 2.2.1 to 1.26.18 in the requirements file. This will ensure compatibility with the latest libraries while maintaining the application's functionality. --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 077fec8..22e0d00 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,11 @@ pytest==6.2.5 black==21.9b0 flake8==3.9.2 pyflakes==2.3.1 -cryptography~=42.0.5 +cryptography~=3.4.8 setuptools~=68.0.0 pycparser~=2.20 idna~=3.2 -urllib3~=2.2.1 +urllib3~=1.26.18 certifi~=2023.7.22 requests~=2.31.0 paho-mqtt~=1.5.1 From c381337c981de541053aca528fa1ffc6be3e7d9f Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 10:30:31 +0200 Subject: [PATCH 3/8] Downgrade protobuf package Protobuf package version has been downgraded from 3.20.3 to 3.18.0 in the requirements.txt file. This change maintains compatibility with other dependencies that are yet to support the newer version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22e0d00..c339a14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ urllib3~=1.26.18 certifi~=2023.7.22 requests~=2.31.0 paho-mqtt~=1.5.1 -protobuf~=3.20.3 +protobuf~=3.18.0 google~=3.0.0 toml~=0.10.2 build~=1.1.1 From ff72b7d5590542e24fd467dde1173edc455e0053 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 13:58:36 +0200 Subject: [PATCH 4/8] Refactor codebase for agrirouter integration The codebase has been heavily refactored to introduce the "agrirouter" namespace. Among other changes, the original 'src' module is now within 'agrirouter'. All corresponding root-level paths, import paths, and descriptor full names have been updated to reflect this change, ensuring that the module hierarchy is correct. --- example_script.py | 24 ++++----- src/{api => agrirouter}/__init__.py | 0 src/{auth => agrirouter/api}/__init__.py | 0 src/{ => agrirouter}/api/enums.py | 0 src/{ => agrirouter}/api/environments.py | 2 +- src/{ => agrirouter}/api/exceptions.py | 0 src/{ => agrirouter}/api/keys.py | 0 .../auth}/__init__.py | 0 src/{ => agrirouter}/auth/auth.py | 6 +-- src/{ => agrirouter}/auth/dto.py | 2 +- src/{ => agrirouter}/auth/parameters.py | 2 +- src/{ => agrirouter}/auth/response.py | 6 +-- .../environments}/__init__.py | 0 .../environments/environmental_services.py | 2 +- .../generated}/__init__.py | 0 .../cloud_provider_integration}/__init__.py | 0 .../cloud_virtualized_app_registration_pb2.py | 2 +- .../generated/commons}/__init__.py | 0 .../generated/commons/chunk_pb2.py | 12 ++--- .../generated/commons/message_pb2.py | 0 .../generated/messaging}/__init__.py | 0 .../generated/messaging/request}/__init__.py | 0 .../messaging/request/payload}/__init__.py | 0 .../request/payload/account}/__init__.py | 0 .../request/payload/account/endpoints_pb2.py | 0 .../request/payload/efdi}/__init__.py | 0 .../request/payload/efdi/efdi_pb2.py | 0 .../request/payload/endpoint}/__init__.py | 0 .../payload/endpoint/capabilities_pb2.py | 0 .../payload/endpoint/subscription_pb2.py | 0 .../request/payload/feed}/__init__.py | 0 .../request/payload/feed/feed_requests_pb2.py | 0 .../request/payload/gps}/__init__.py | 0 .../messaging/request/payload/gps/gps_pb2.py | 0 .../messaging/request/request_pb2.py | 6 +-- .../generated/messaging/response}/__init__.py | 0 .../messaging/response/payload}/__init__.py | 0 .../response/payload/account}/__init__.py | 0 .../response/payload/account/endpoints_pb2.py | 0 .../response/payload/endpoint}/__init__.py | 0 .../payload/endpoint/capability_pb2.py | 0 .../response/payload/feed}/__init__.py | 0 .../payload/feed/feed_response_pb2.py | 6 +-- .../payload/feed/push_notification_pb2.py | 6 +-- .../messaging/response/response_pb2.py | 0 .../generated/settings}/__init__.py | 0 .../generated/settings/dh_settings_pb2.py | 0 .../messaging}/__init__.py | 0 src/{ => agrirouter}/messaging/builders.py | 6 +-- .../messaging/certification.py | 2 +- .../messaging/clients}/__init__.py | 0 .../messaging/clients/constants.py | 0 .../messaging/clients/http.py | 4 +- .../messaging/clients/mqtt.py | 4 +- src/{ => agrirouter}/messaging/decode.py | 16 +++--- src/{ => agrirouter}/messaging/encode.py | 16 +++--- src/{ => agrirouter}/messaging/messages.py | 4 +- .../messaging/parameters}/__init__.py | 0 .../messaging/parameters/dto.py | 6 +-- .../messaging/parameters/service.py | 14 +++--- src/{ => agrirouter}/messaging/request.py | 0 src/{ => agrirouter}/messaging/result.py | 2 +- .../messaging/services}/__init__.py | 0 .../messaging/services/cloud.py | 18 +++---- .../messaging/services/commons.py | 18 +++---- .../messaging/services/http}/__init__.py | 0 .../services/http/fetch_message_service.py | 6 +-- .../messaging/services/messaging.py | 32 ++++++------ .../services/sequence_number_service.py | 0 .../onboarding}/__init__.py | 0 src/{ => agrirouter}/onboarding/dto.py | 2 +- src/{ => agrirouter}/onboarding/enums.py | 2 +- src/{ => agrirouter}/onboarding/headers.py | 4 +- src/{ => agrirouter}/onboarding/parameters.py | 6 +-- src/{ => agrirouter}/onboarding/request.py | 10 ++-- .../onboarding/request_body.py | 4 +- src/{ => agrirouter}/onboarding/response.py | 4 +- .../onboarding/services.py} | 16 +++--- src/{ => agrirouter}/onboarding/signature.py | 0 .../revoking}/__init__.py | 0 src/{ => agrirouter}/revoking/headers.py | 2 +- src/{ => agrirouter}/revoking/parameters.py | 2 +- src/{ => agrirouter}/revoking/request.py | 6 +-- src/{ => agrirouter}/revoking/request_body.py | 0 src/{ => agrirouter}/revoking/response.py | 0 src/{ => agrirouter}/revoking/revoking.py | 14 +++--- .../agrirouter/utils}/__init__.py | 0 src/agrirouter/utils/type_url.py | 47 ++++++++++++++++++ src/{ => agrirouter}/utils/utc_time_util.py | 2 +- src/{ => agrirouter}/utils/uuid_util.py | 0 src/utils/type_url.py | 47 ------------------ tests/{data => agrirouter}/__init__.py | 0 .../common}/__init__.py | 0 tests/{ => agrirouter}/common/constants.py | 0 .../{ => agrirouter}/common/data_provider.py | 0 tests/{ => agrirouter}/common/onboarding.py | 4 +- tests/{ => agrirouter}/common/sleeper.py | 0 .../{internal => agrirouter/data}/__init__.py | 0 tests/{ => agrirouter}/data/applications.py | 0 .../{ => agrirouter}/data/content/example.png | Bin .../data/content/large_bmp.bmp | Bin .../data/content/large_shape.zip | Bin .../data/content/small_shape.zip | Bin .../data/content/small_taskdata.zip | Bin tests/{ => agrirouter}/data/identifier.py | 0 .../onboard_response_integration_service.py | 2 +- .../Http/CommunicationUnit/PEM/Recipient.json | 0 .../Http/CommunicationUnit/PEM/Sender.json | 0 .../CommunicationUnit/Messages/Recipient.json | 0 .../CommunicationUnit/Messages/Sender.json | 0 .../Mqtt/CommunicationUnit/PEM/Recipient.json | 0 .../Mqtt/CommunicationUnit/PEM/Sender.json | 0 .../data/onboarding_responses/test.json | 0 .../fixtures}/__init__.py | 0 .../fixtures/update_http_onboard_responses.py | 22 ++++---- .../fixtures/update_mqtt_onboard_responses.py | 28 +++++------ .../internal}/__init__.py | 0 .../internal/auth}/__init__.py | 0 .../internal/auth}/test_auth.py | 8 +-- .../internal/auth}/test_auth_dto.py | 4 +- .../internal/auth}/test_response.py | 4 +- .../internal/environments}/__init__.py | 0 .../test_environmental_services.py | 4 +- .../environments}/test_environments.py | 6 +-- .../internal/messaging}/__init__.py | 0 .../internal/messaging}/test_decode.py | 6 +-- .../internal/messaging}/test_encode.py | 8 +-- .../internal/messaging}/test_request.py | 4 +- .../internal/onboarding}/__init__.py | 0 .../internal/onboarding}/test_headers.py | 4 +- .../internal/onboarding}/test_onboarding.py | 14 +++--- .../onboarding}/test_onboarding_dto.py | 4 +- .../onboarding}/test_request_onboarding.py | 10 ++-- .../internal/onboarding}/test_signature.py | 4 +- .../internal/revoking}/__init__.py | 0 .../internal/revoking}/test_parameters.py | 4 +- .../internal/test_validate_toml.py | 2 +- .../mqtt => agrirouter/service}/__init__.py | 0 .../agrirouter/service/messaging/__init__.py | 0 .../service/messaging/mqtt/__init__.py | 0 .../messaging/mqtt/test_capability_service.py | 28 +++++------ .../mqtt/test_feed_confirm_service.py | 30 +++++------ .../mqtt/test_feed_delete_service.py | 28 +++++------ .../mqtt/test_list_endpoints_service.py | 22 ++++---- .../mqtt/test_publish_message_service.py | 28 +++++------ .../mqtt/test_query_header_service.py | 30 +++++------ .../mqtt/test_query_message_service.py | 30 +++++------ ..._receive_chunked_messages_from_the_feed.py | 32 ++++++------ ...ges_and_receive_with_push_notifications.py | 32 ++++++------ .../mqtt/test_send_direct_message_service.py | 28 +++++------ .../mqtt/test_subscription_service.py | 28 +++++------ 151 files changed, 425 insertions(+), 425 deletions(-) rename src/{api => agrirouter}/__init__.py (100%) rename src/{auth => agrirouter/api}/__init__.py (100%) rename src/{ => agrirouter}/api/enums.py (100%) rename src/{ => agrirouter}/api/environments.py (97%) rename src/{ => agrirouter}/api/exceptions.py (100%) rename src/{ => agrirouter}/api/keys.py (100%) rename src/{environments => agrirouter/auth}/__init__.py (100%) rename src/{ => agrirouter}/auth/auth.py (85%) rename src/{ => agrirouter}/auth/dto.py (98%) rename src/{ => agrirouter}/auth/parameters.py (95%) rename src/{ => agrirouter}/auth/response.py (93%) rename src/{generated => agrirouter/environments}/__init__.py (100%) rename src/{ => agrirouter}/environments/environmental_services.py (91%) rename src/{generated/cloud_provider_integration => agrirouter/generated}/__init__.py (100%) rename src/{generated/commons => agrirouter/generated/cloud_provider_integration}/__init__.py (100%) rename src/{ => agrirouter}/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py (99%) rename src/{generated/messaging => agrirouter/generated/commons}/__init__.py (100%) rename src/{ => agrirouter}/generated/commons/chunk_pb2.py (85%) rename src/{ => agrirouter}/generated/commons/message_pb2.py (100%) rename src/{generated/messaging/request => agrirouter/generated/messaging}/__init__.py (100%) rename src/{generated/messaging/request/payload => agrirouter/generated/messaging/request}/__init__.py (100%) rename src/{generated/messaging/request/payload/account => agrirouter/generated/messaging/request/payload}/__init__.py (100%) rename src/{generated/messaging/request/payload/efdi => agrirouter/generated/messaging/request/payload/account}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/account/endpoints_pb2.py (100%) rename src/{generated/messaging/request/payload/endpoint => agrirouter/generated/messaging/request/payload/efdi}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/efdi/efdi_pb2.py (100%) rename src/{generated/messaging/request/payload/feed => agrirouter/generated/messaging/request/payload/endpoint}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/endpoint/capabilities_pb2.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/endpoint/subscription_pb2.py (100%) rename src/{generated/messaging/request/payload/gps => agrirouter/generated/messaging/request/payload/feed}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/feed/feed_requests_pb2.py (100%) rename src/{generated/messaging/response => agrirouter/generated/messaging/request/payload/gps}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/request/payload/gps/gps_pb2.py (100%) rename src/{ => agrirouter}/generated/messaging/request/request_pb2.py (94%) rename src/{generated/messaging/response/payload => agrirouter/generated/messaging/response}/__init__.py (100%) rename src/{generated/messaging/response/payload/account => agrirouter/generated/messaging/response/payload}/__init__.py (100%) rename src/{generated/messaging/response/payload/endpoint => agrirouter/generated/messaging/response/payload/account}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/response/payload/account/endpoints_pb2.py (100%) rename src/{generated/messaging/response/payload/feed => agrirouter/generated/messaging/response/payload/endpoint}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/response/payload/endpoint/capability_pb2.py (100%) rename src/{generated/settings => agrirouter/generated/messaging/response/payload/feed}/__init__.py (100%) rename src/{ => agrirouter}/generated/messaging/response/payload/feed/feed_response_pb2.py (92%) rename src/{ => agrirouter}/generated/messaging/response/payload/feed/push_notification_pb2.py (93%) rename src/{ => agrirouter}/generated/messaging/response/response_pb2.py (100%) rename src/{messaging => agrirouter/generated/settings}/__init__.py (100%) rename src/{ => agrirouter}/generated/settings/dh_settings_pb2.py (100%) rename src/{messaging/clients => agrirouter/messaging}/__init__.py (100%) rename src/{ => agrirouter}/messaging/builders.py (96%) rename src/{ => agrirouter}/messaging/certification.py (88%) rename src/{messaging/parameters => agrirouter/messaging/clients}/__init__.py (100%) rename src/{ => agrirouter}/messaging/clients/constants.py (100%) rename src/{ => agrirouter}/messaging/clients/http.py (94%) rename src/{ => agrirouter}/messaging/clients/mqtt.py (97%) rename src/{ => agrirouter}/messaging/decode.py (78%) rename src/{ => agrirouter}/messaging/encode.py (91%) rename src/{ => agrirouter}/messaging/messages.py (96%) rename src/{messaging/services => agrirouter/messaging/parameters}/__init__.py (100%) rename src/{ => agrirouter}/messaging/parameters/dto.py (97%) rename src/{ => agrirouter}/messaging/parameters/service.py (97%) rename src/{ => agrirouter}/messaging/request.py (100%) rename src/{ => agrirouter}/messaging/result.py (96%) rename src/{messaging/services/http => agrirouter/messaging/services}/__init__.py (100%) rename src/{ => agrirouter}/messaging/services/cloud.py (77%) rename src/{ => agrirouter}/messaging/services/commons.py (87%) rename src/{onboarding => agrirouter/messaging/services/http}/__init__.py (100%) rename src/{ => agrirouter}/messaging/services/http/fetch_message_service.py (76%) rename src/{ => agrirouter}/messaging/services/messaging.py (92%) rename src/{ => agrirouter}/messaging/services/sequence_number_service.py (100%) rename src/{revoking => agrirouter/onboarding}/__init__.py (100%) rename src/{ => agrirouter}/onboarding/dto.py (99%) rename src/{ => agrirouter}/onboarding/enums.py (73%) rename src/{ => agrirouter}/onboarding/headers.py (91%) rename src/{ => agrirouter}/onboarding/parameters.py (89%) rename src/{ => agrirouter}/onboarding/request.py (78%) rename src/{ => agrirouter}/onboarding/request_body.py (92%) rename src/{ => agrirouter}/onboarding/response.py (97%) rename src/{onboarding/onboarding.py => agrirouter/onboarding/services.py} (82%) rename src/{ => agrirouter}/onboarding/signature.py (100%) rename src/{utils => agrirouter/revoking}/__init__.py (100%) rename src/{ => agrirouter}/revoking/headers.py (93%) rename src/{ => agrirouter}/revoking/parameters.py (94%) rename src/{ => agrirouter}/revoking/request.py (81%) rename src/{ => agrirouter}/revoking/request_body.py (100%) rename src/{ => agrirouter}/revoking/response.py (100%) rename src/{ => agrirouter}/revoking/revoking.py (74%) rename {tests/common => src/agrirouter/utils}/__init__.py (100%) create mode 100644 src/agrirouter/utils/type_url.py rename src/{ => agrirouter}/utils/utc_time_util.py (95%) rename src/{ => agrirouter}/utils/uuid_util.py (100%) delete mode 100644 src/utils/type_url.py rename tests/{data => agrirouter}/__init__.py (100%) rename tests/{fixtures => agrirouter/common}/__init__.py (100%) rename tests/{ => agrirouter}/common/constants.py (100%) rename tests/{ => agrirouter}/common/data_provider.py (100%) rename tests/{ => agrirouter}/common/onboarding.py (91%) rename tests/{ => agrirouter}/common/sleeper.py (100%) rename tests/{internal => agrirouter/data}/__init__.py (100%) rename tests/{ => agrirouter}/data/applications.py (100%) rename tests/{ => agrirouter}/data/content/example.png (100%) rename tests/{ => agrirouter}/data/content/large_bmp.bmp (100%) rename tests/{ => agrirouter}/data/content/large_shape.zip (100%) rename tests/{ => agrirouter}/data/content/small_shape.zip (100%) rename tests/{ => agrirouter}/data/content/small_taskdata.zip (100%) rename tests/{ => agrirouter}/data/identifier.py (100%) rename tests/{ => agrirouter}/data/onboard_response_integration_service.py (94%) rename tests/{ => agrirouter}/data/onboarding_responses/Http/CommunicationUnit/PEM/Recipient.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/Http/CommunicationUnit/PEM/Sender.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Recipient.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Sender.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Recipient.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Sender.json (100%) rename tests/{ => agrirouter}/data/onboarding_responses/test.json (100%) rename tests/{internal/auth_test => agrirouter/fixtures}/__init__.py (100%) rename tests/{ => agrirouter}/fixtures/update_http_onboard_responses.py (88%) rename tests/{ => agrirouter}/fixtures/update_mqtt_onboard_responses.py (84%) rename tests/{internal/enviroments_test => agrirouter/internal}/__init__.py (100%) rename tests/{internal/messaging_test => agrirouter/internal/auth}/__init__.py (100%) rename tests/{internal/auth_test => agrirouter/internal/auth}/test_auth.py (90%) rename tests/{internal/auth_test => agrirouter/internal/auth}/test_auth_dto.py (96%) rename tests/{internal/auth_test => agrirouter/internal/auth}/test_response.py (90%) rename tests/{internal/onboarding_test => agrirouter/internal/environments}/__init__.py (100%) rename tests/{internal/enviroments_test => agrirouter/internal/environments}/test_environmental_services.py (61%) rename tests/{internal/enviroments_test => agrirouter/internal/environments}/test_environments.py (96%) rename tests/{internal/test_revoking => agrirouter/internal/messaging}/__init__.py (100%) rename tests/{internal/messaging_test => agrirouter/internal/messaging}/test_decode.py (93%) rename tests/{internal/messaging_test => agrirouter/internal/messaging}/test_encode.py (69%) rename tests/{internal/messaging_test => agrirouter/internal/messaging}/test_request.py (77%) rename tests/{service => agrirouter/internal/onboarding}/__init__.py (100%) rename tests/{internal/onboarding_test => agrirouter/internal/onboarding}/test_headers.py (82%) rename tests/{internal/onboarding_test => agrirouter/internal/onboarding}/test_onboarding.py (79%) rename tests/{internal/onboarding_test => agrirouter/internal/onboarding}/test_onboarding_dto.py (98%) rename tests/{internal/onboarding_test => agrirouter/internal/onboarding}/test_request_onboarding.py (77%) rename tests/{internal/onboarding_test => agrirouter/internal/onboarding}/test_signature.py (79%) rename tests/{service/messaging => agrirouter/internal/revoking}/__init__.py (100%) rename tests/{internal/test_revoking => agrirouter/internal/revoking}/test_parameters.py (89%) rename tests/{ => agrirouter}/internal/test_validate_toml.py (66%) rename tests/{service/messaging/mqtt => agrirouter/service}/__init__.py (100%) create mode 100644 tests/agrirouter/service/messaging/__init__.py create mode 100644 tests/agrirouter/service/messaging/mqtt/__init__.py rename tests/{ => agrirouter}/service/messaging/mqtt/test_capability_service.py (80%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_feed_confirm_service.py (92%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_feed_delete_service.py (94%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_list_endpoints_service.py (92%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_publish_message_service.py (87%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_query_header_service.py (95%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_query_message_service.py (94%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py (90%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py (87%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_send_direct_message_service.py (87%) rename tests/{ => agrirouter}/service/messaging/mqtt/test_subscription_service.py (85%) diff --git a/example_script.py b/example_script.py index 4cda3aa..623e23d 100644 --- a/example_script.py +++ b/example_script.py @@ -2,9 +2,9 @@ from google.protobuf.timestamp_pb2 import Timestamp -from src.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery -from src.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod -from src.onboarding.response import OnboardResponse +from src.agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery +from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod +from src.agrirouter.onboarding.response import OnboardResponse public_key = """-----BEGIN PUBLIC KEY----- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGt41/+kSOTlO1sJvLIN @@ -65,14 +65,14 @@ } import src as ar -from src.onboarding.enums import Gateways -from src.api.enums import CapabilityType -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.messaging.services.commons import HttpMessagingService, MqttMessagingService +from src.agrirouter.onboarding.enums import Gateways +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.messaging.services.commons import HttpMessagingService, MqttMessagingService from src import ListEndpointsParameters, ListEndpointsService, SubscriptionService, SubscriptionParameters, \ QueryHeaderService, QueryHeaderParameters, CapabilitiesService, CapabilitiesParameters -from src.utils.uuid_util import new_uuid +from src.agrirouter.utils.uuid_util import new_uuid application_id = "8c947a45-c57d-42d2-affc-206e21d63a50" # # store here your application id. You can find it in AR UI certification_version_id = "edd5d6b7-45bb-4471-898e-ff9c2a7bf56f" # # store here your certification version id. You can find it in AR UI @@ -298,9 +298,9 @@ def example_query_header_message_mqtt(onboarding_response_data, on_msg_callback) def on_message_callback(client, userdata, msg): # Define here the way receiving messages will be processed - from src.messaging.decode import decode_response - from src.messaging.decode import decode_details - from src.messaging.messages import OutboxMessage + from src.agrirouter.messaging.decode import decode_response + from src.agrirouter.messaging.decode import decode_details + from src.agrirouter.messaging.messages import OutboxMessage outbox_message = OutboxMessage() outbox_message.json_deserialize(msg.payload.decode().replace("'", '"')) diff --git a/src/api/__init__.py b/src/agrirouter/__init__.py similarity index 100% rename from src/api/__init__.py rename to src/agrirouter/__init__.py diff --git a/src/auth/__init__.py b/src/agrirouter/api/__init__.py similarity index 100% rename from src/auth/__init__.py rename to src/agrirouter/api/__init__.py diff --git a/src/api/enums.py b/src/agrirouter/api/enums.py similarity index 100% rename from src/api/enums.py rename to src/agrirouter/api/enums.py diff --git a/src/api/environments.py b/src/agrirouter/api/environments.py similarity index 97% rename from src/api/environments.py rename to src/agrirouter/api/environments.py index bbb2f0a..09d4d69 100644 --- a/src/api/environments.py +++ b/src/agrirouter/api/environments.py @@ -1,4 +1,4 @@ -from src.api.keys import AR_QA_PUBLIC_KEY, AR_PROD_PUBLIC_KEY +from src.agrirouter.api.keys import AR_QA_PUBLIC_KEY, AR_PROD_PUBLIC_KEY class BaseEnvironment: diff --git a/src/api/exceptions.py b/src/agrirouter/api/exceptions.py similarity index 100% rename from src/api/exceptions.py rename to src/agrirouter/api/exceptions.py diff --git a/src/api/keys.py b/src/agrirouter/api/keys.py similarity index 100% rename from src/api/keys.py rename to src/agrirouter/api/keys.py diff --git a/src/environments/__init__.py b/src/agrirouter/auth/__init__.py similarity index 100% rename from src/environments/__init__.py rename to src/agrirouter/auth/__init__.py diff --git a/src/auth/auth.py b/src/agrirouter/auth/auth.py similarity index 85% rename from src/auth/auth.py rename to src/agrirouter/auth/auth.py index 6dfc761..6b4166e 100644 --- a/src/auth/auth.py +++ b/src/agrirouter/auth/auth.py @@ -1,8 +1,8 @@ from urllib.parse import urlparse, parse_qs -from src.auth.parameters import AuthUrlParameter -from src.auth.response import AuthResponse -from src.environments.environmental_services import EnvironmentalService +from src.agrirouter.auth.parameters import AuthUrlParameter +from src.agrirouter.auth.response import AuthResponse +from src.agrirouter.environments.environmental_services import EnvironmentalService class Authorization(EnvironmentalService): diff --git a/src/auth/dto.py b/src/agrirouter/auth/dto.py similarity index 98% rename from src/auth/dto.py rename to src/agrirouter/auth/dto.py index 737c073..daed290 100644 --- a/src/auth/dto.py +++ b/src/agrirouter/auth/dto.py @@ -1,7 +1,7 @@ import json from typing import Union -from src.api.exceptions import WrongField +from src.agrirouter.api.exceptions import WrongField class AuthorizationToken: diff --git a/src/auth/parameters.py b/src/agrirouter/auth/parameters.py similarity index 95% rename from src/auth/parameters.py rename to src/agrirouter/auth/parameters.py index ecab7ba..64d4768 100644 --- a/src/auth/parameters.py +++ b/src/agrirouter/auth/parameters.py @@ -1,6 +1,6 @@ from uuid import uuid4 -from src.api.enums import ResponseTypes +from src.agrirouter.api.enums import ResponseTypes class AuthUrlParameter: diff --git a/src/auth/response.py b/src/agrirouter/auth/response.py similarity index 93% rename from src/auth/response.py rename to src/agrirouter/auth/response.py index 96b0d3a..5b8b9d1 100644 --- a/src/auth/response.py +++ b/src/agrirouter/auth/response.py @@ -5,14 +5,14 @@ from cryptography.exceptions import InvalidSignature -from src.auth.dto import AuthorizationToken, AuthorizationResultUrl -from src.onboarding.signature import verify_signature +from src.agrirouter.auth.dto import AuthorizationToken, AuthorizationResultUrl +from src.agrirouter.onboarding.signature import verify_signature # from cryptography.exceptions import InvalidSignature -# from src.onboarding.signature import verify_signature +# from src.agrirouter.onboarding.signature import verify_signature class AuthResponse: diff --git a/src/generated/__init__.py b/src/agrirouter/environments/__init__.py similarity index 100% rename from src/generated/__init__.py rename to src/agrirouter/environments/__init__.py diff --git a/src/environments/environmental_services.py b/src/agrirouter/environments/environmental_services.py similarity index 91% rename from src/environments/environmental_services.py rename to src/agrirouter/environments/environmental_services.py index d8f5dac..9009751 100644 --- a/src/environments/environmental_services.py +++ b/src/agrirouter/environments/environmental_services.py @@ -1,4 +1,4 @@ -from src.api.environments import BaseEnvironment +from src.agrirouter.api.environments import BaseEnvironment class EnvironmentalService: diff --git a/src/generated/cloud_provider_integration/__init__.py b/src/agrirouter/generated/__init__.py similarity index 100% rename from src/generated/cloud_provider_integration/__init__.py rename to src/agrirouter/generated/__init__.py diff --git a/src/generated/commons/__init__.py b/src/agrirouter/generated/cloud_provider_integration/__init__.py similarity index 100% rename from src/generated/commons/__init__.py rename to src/agrirouter/generated/cloud_provider_integration/__init__.py diff --git a/src/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py b/src/agrirouter/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py similarity index 99% rename from src/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py rename to src/agrirouter/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py index 39fff07..5dfafa6 100644 --- a/src/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py +++ b/src/agrirouter/generated/cloud_provider_integration/cloud_virtualized_app_registration_pb2.py @@ -11,7 +11,7 @@ _sym_db = _symbol_database.Default() -from src.generated.commons import message_pb2 as commons_dot_message__pb2 +from src.agrirouter.generated.commons import message_pb2 as commons_dot_message__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='cloud-provider-integration/cloud-virtualized-app-registration.proto', diff --git a/src/generated/messaging/__init__.py b/src/agrirouter/generated/commons/__init__.py similarity index 100% rename from src/generated/messaging/__init__.py rename to src/agrirouter/generated/commons/__init__.py diff --git a/src/generated/commons/chunk_pb2.py b/src/agrirouter/generated/commons/chunk_pb2.py similarity index 85% rename from src/generated/commons/chunk_pb2.py rename to src/agrirouter/generated/commons/chunk_pb2.py index 96627a4..d8117f7 100644 --- a/src/generated/commons/chunk_pb2.py +++ b/src/agrirouter/generated/commons/chunk_pb2.py @@ -22,35 +22,35 @@ _CHUNKCOMPONENT = _descriptor.Descriptor( name='ChunkComponent', - full_name='src.commons.ChunkComponent', + full_name='src.agrirouter.commons.ChunkComponent', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='context_id', full_name='src.commons.ChunkComponent.context_id', index=0, + name='context_id', full_name='src.agrirouter.commons.ChunkComponent.context_id', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='current', full_name='src.commons.ChunkComponent.current', index=1, + name='current', full_name='src.agrirouter.commons.ChunkComponent.current', index=1, number=2, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='total', full_name='src.commons.ChunkComponent.total', index=2, + name='total', full_name='src.agrirouter.commons.ChunkComponent.total', index=2, number=3, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='total_size', full_name='src.commons.ChunkComponent.total_size', index=3, + name='total_size', full_name='src.agrirouter.commons.ChunkComponent.total_size', index=3, number=4, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -78,7 +78,7 @@ ChunkComponent = _reflection.GeneratedProtocolMessageType('ChunkComponent', (_message.Message,), { 'DESCRIPTOR': _CHUNKCOMPONENT, '__module__': 'commons.chunk_pb2' - # @@protoc_insertion_point(class_scope:src.commons.ChunkComponent) + # @@protoc_insertion_point(class_scope:src.agrirouter.commons.ChunkComponent) }) _sym_db.RegisterMessage(ChunkComponent) diff --git a/src/generated/commons/message_pb2.py b/src/agrirouter/generated/commons/message_pb2.py similarity index 100% rename from src/generated/commons/message_pb2.py rename to src/agrirouter/generated/commons/message_pb2.py diff --git a/src/generated/messaging/request/__init__.py b/src/agrirouter/generated/messaging/__init__.py similarity index 100% rename from src/generated/messaging/request/__init__.py rename to src/agrirouter/generated/messaging/__init__.py diff --git a/src/generated/messaging/request/payload/__init__.py b/src/agrirouter/generated/messaging/request/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/__init__.py rename to src/agrirouter/generated/messaging/request/__init__.py diff --git a/src/generated/messaging/request/payload/account/__init__.py b/src/agrirouter/generated/messaging/request/payload/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/account/__init__.py rename to src/agrirouter/generated/messaging/request/payload/__init__.py diff --git a/src/generated/messaging/request/payload/efdi/__init__.py b/src/agrirouter/generated/messaging/request/payload/account/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/efdi/__init__.py rename to src/agrirouter/generated/messaging/request/payload/account/__init__.py diff --git a/src/generated/messaging/request/payload/account/endpoints_pb2.py b/src/agrirouter/generated/messaging/request/payload/account/endpoints_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/account/endpoints_pb2.py rename to src/agrirouter/generated/messaging/request/payload/account/endpoints_pb2.py diff --git a/src/generated/messaging/request/payload/endpoint/__init__.py b/src/agrirouter/generated/messaging/request/payload/efdi/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/endpoint/__init__.py rename to src/agrirouter/generated/messaging/request/payload/efdi/__init__.py diff --git a/src/generated/messaging/request/payload/efdi/efdi_pb2.py b/src/agrirouter/generated/messaging/request/payload/efdi/efdi_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/efdi/efdi_pb2.py rename to src/agrirouter/generated/messaging/request/payload/efdi/efdi_pb2.py diff --git a/src/generated/messaging/request/payload/feed/__init__.py b/src/agrirouter/generated/messaging/request/payload/endpoint/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/feed/__init__.py rename to src/agrirouter/generated/messaging/request/payload/endpoint/__init__.py diff --git a/src/generated/messaging/request/payload/endpoint/capabilities_pb2.py b/src/agrirouter/generated/messaging/request/payload/endpoint/capabilities_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/endpoint/capabilities_pb2.py rename to src/agrirouter/generated/messaging/request/payload/endpoint/capabilities_pb2.py diff --git a/src/generated/messaging/request/payload/endpoint/subscription_pb2.py b/src/agrirouter/generated/messaging/request/payload/endpoint/subscription_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/endpoint/subscription_pb2.py rename to src/agrirouter/generated/messaging/request/payload/endpoint/subscription_pb2.py diff --git a/src/generated/messaging/request/payload/gps/__init__.py b/src/agrirouter/generated/messaging/request/payload/feed/__init__.py similarity index 100% rename from src/generated/messaging/request/payload/gps/__init__.py rename to src/agrirouter/generated/messaging/request/payload/feed/__init__.py diff --git a/src/generated/messaging/request/payload/feed/feed_requests_pb2.py b/src/agrirouter/generated/messaging/request/payload/feed/feed_requests_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/feed/feed_requests_pb2.py rename to src/agrirouter/generated/messaging/request/payload/feed/feed_requests_pb2.py diff --git a/src/generated/messaging/response/__init__.py b/src/agrirouter/generated/messaging/request/payload/gps/__init__.py similarity index 100% rename from src/generated/messaging/response/__init__.py rename to src/agrirouter/generated/messaging/request/payload/gps/__init__.py diff --git a/src/generated/messaging/request/payload/gps/gps_pb2.py b/src/agrirouter/generated/messaging/request/payload/gps/gps_pb2.py similarity index 100% rename from src/generated/messaging/request/payload/gps/gps_pb2.py rename to src/agrirouter/generated/messaging/request/payload/gps/gps_pb2.py diff --git a/src/generated/messaging/request/request_pb2.py b/src/agrirouter/generated/messaging/request/request_pb2.py similarity index 94% rename from src/generated/messaging/request/request_pb2.py rename to src/agrirouter/generated/messaging/request/request_pb2.py index acec7d6..8a4241e 100644 --- a/src/generated/messaging/request/request_pb2.py +++ b/src/agrirouter/generated/messaging/request/request_pb2.py @@ -13,8 +13,8 @@ from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -from src.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 -from src.generated.commons import message_pb2 as commons_dot_message__pb2 +from src.agrirouter.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 +from src.agrirouter.generated.commons import message_pb2 as commons_dot_message__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='messaging/request/request.proto', @@ -22,7 +22,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x1fmessaging/request/request.proto\x12\x12\x61grirouter.request\x1a\x19google/protobuf/any.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13\x63ommons/chunk.proto\x1a\x15\x63ommons/message.proto\"\xaf\x03\n\x0fRequestEnvelope\x12\x1e\n\x16\x61pplication_message_id\x18\x01 \x01(\t\x12\"\n\x1a\x61pplication_message_seq_no\x18\x02 \x01(\x03\x12\x1e\n\x16technical_message_type\x18\x03 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x04 \x01(\t\x12\x36\n\x04mode\x18\x05 \x01(\x0e\x32(.src.request.RequestEnvelope.Mode\x12\x12\n\nrecipients\x18\x06 \x03(\t\x12\x36\n\nchunk_info\x18\x07 \x01(\x0b\x32\".src.commons.ChunkComponent\x12-\n\ttimestamp\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\x08metadata\x18\t \x01(\x0b\x32\x1c.src.commons.Metadata\"8\n\x04Mode\x12\n\n\x06\x44IRECT\x10\x00\x12\x0b\n\x07PUBLISH\x10\x01\x12\x17\n\x13PUBLISH_WITH_DIRECT\x10\x02\">\n\x15RequestPayloadWrapper\x12%\n\x07\x64\x65tails\x18\x01 \x01(\x0b\x32\x14.google.protobuf.Anyb\x06proto3' + serialized_pb=b'\n\x1fmessaging/request/request.proto\x12\x12\x61grirouter.request\x1a\x19google/protobuf/any.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13\x63ommons/chunk.proto\x1a\x15\x63ommons/message.proto\"\xaf\x03\n\x0fRequestEnvelope\x12\x1e\n\x16\x61pplication_message_id\x18\x01 \x01(\t\x12\"\n\x1a\x61pplication_message_seq_no\x18\x02 \x01(\x03\x12\x1e\n\x16technical_message_type\x18\x03 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x04 \x01(\t\x12\x36\n\x04mode\x18\x05 \x01(\x0e\x32(.src.request.RequestEnvelope.Mode\x12\x12\n\nrecipients\x18\x06 \x03(\t\x12\x36\n\nchunk_info\x18\x07 \x01(\x0b\x32\".src.agrirouter.commons.ChunkComponent\x12-\n\ttimestamp\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\x08metadata\x18\t \x01(\x0b\x32\x1c.src.commons.Metadata\"8\n\x04Mode\x12\n\n\x06\x44IRECT\x10\x00\x12\x0b\n\x07PUBLISH\x10\x01\x12\x17\n\x13PUBLISH_WITH_DIRECT\x10\x02\">\n\x15RequestPayloadWrapper\x12%\n\x07\x64\x65tails\x18\x01 \x01(\x0b\x32\x14.google.protobuf.Anyb\x06proto3' , dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR, google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR, commons_dot_chunk__pb2.DESCRIPTOR, commons_dot_message__pb2.DESCRIPTOR, ]) diff --git a/src/generated/messaging/response/payload/__init__.py b/src/agrirouter/generated/messaging/response/__init__.py similarity index 100% rename from src/generated/messaging/response/payload/__init__.py rename to src/agrirouter/generated/messaging/response/__init__.py diff --git a/src/generated/messaging/response/payload/account/__init__.py b/src/agrirouter/generated/messaging/response/payload/__init__.py similarity index 100% rename from src/generated/messaging/response/payload/account/__init__.py rename to src/agrirouter/generated/messaging/response/payload/__init__.py diff --git a/src/generated/messaging/response/payload/endpoint/__init__.py b/src/agrirouter/generated/messaging/response/payload/account/__init__.py similarity index 100% rename from src/generated/messaging/response/payload/endpoint/__init__.py rename to src/agrirouter/generated/messaging/response/payload/account/__init__.py diff --git a/src/generated/messaging/response/payload/account/endpoints_pb2.py b/src/agrirouter/generated/messaging/response/payload/account/endpoints_pb2.py similarity index 100% rename from src/generated/messaging/response/payload/account/endpoints_pb2.py rename to src/agrirouter/generated/messaging/response/payload/account/endpoints_pb2.py diff --git a/src/generated/messaging/response/payload/feed/__init__.py b/src/agrirouter/generated/messaging/response/payload/endpoint/__init__.py similarity index 100% rename from src/generated/messaging/response/payload/feed/__init__.py rename to src/agrirouter/generated/messaging/response/payload/endpoint/__init__.py diff --git a/src/generated/messaging/response/payload/endpoint/capability_pb2.py b/src/agrirouter/generated/messaging/response/payload/endpoint/capability_pb2.py similarity index 100% rename from src/generated/messaging/response/payload/endpoint/capability_pb2.py rename to src/agrirouter/generated/messaging/response/payload/endpoint/capability_pb2.py diff --git a/src/generated/settings/__init__.py b/src/agrirouter/generated/messaging/response/payload/feed/__init__.py similarity index 100% rename from src/generated/settings/__init__.py rename to src/agrirouter/generated/messaging/response/payload/feed/__init__.py diff --git a/src/generated/messaging/response/payload/feed/feed_response_pb2.py b/src/agrirouter/generated/messaging/response/payload/feed/feed_response_pb2.py similarity index 92% rename from src/generated/messaging/response/payload/feed/feed_response_pb2.py rename to src/agrirouter/generated/messaging/response/payload/feed/feed_response_pb2.py index 6ffaadc..7dcea31 100644 --- a/src/generated/messaging/response/payload/feed/feed_response_pb2.py +++ b/src/agrirouter/generated/messaging/response/payload/feed/feed_response_pb2.py @@ -13,8 +13,8 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -from src.generated.commons import message_pb2 as commons_dot_message__pb2 -from src.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 +from src.agrirouter.generated.commons import message_pb2 as commons_dot_message__pb2 +from src.agrirouter.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='messaging/response/payload/feed/feed-response.proto', @@ -22,7 +22,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n3messaging/response/payload/feed/feed-response.proto\x12\x18\x61grirouter.feed.response\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19google/protobuf/any.proto\x1a\x15\x63ommons/message.proto\x1a\x13\x63ommons/chunk.proto\"%\n\x04Page\x12\x0e\n\x06number\x18\x01 \x01(\x05\x12\r\n\x05total\x18\x02 \x01(\x05\"N\n\x0cQueryMetrics\x12\x1f\n\x17total_messages_in_query\x18\x01 \x01(\x05\x12\x1d\n\x15max_count_restriction\x18\x02 \x01(\x05\"\xe8\x05\n\x13HeaderQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12:\n\x0e\x63hunk_contexts\x18\x03 \x03(\x0b\x32\".src.commons.ChunkComponent\x12@\n\x04\x66\x65\x65\x64\x18\x04 \x03(\x0b\x32\x32.src.feed.response.HeaderQueryResponse.Feed\x12\x1f\n\x13pending_message_ids\x18\x05 \x03(\tB\x02\x18\x01\x1a\xcd\x02\n\x06Header\x12\x12\n\nmessage_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x18\n\x10\x63hunk_context_id\x18\x04 \x01(\t\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x15\n\rcurrent_chunk\x18\x08 \x01(\x03\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\x08metadata\x18\n \x01(\x0b\x32\x1c.src.commons.Metadata\x1au\n\x04\x46\x65\x65\x64\x12\x11\n\tsender_id\x18\x01 \x01(\t\x12\x13\n\x0breceiver_id\x18\x02 \x01(\t\x12\x45\n\x07headers\x18\x03 \x03(\x0b\x32\x34.src.feed.response.HeaderQueryResponse.Header\"\xd0\x05\n\x14MessageQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12L\n\x08messages\x18\x03 \x03(\x0b\x32:.src.feed.response.MessageQueryResponse.FeedMessage\x1a\xff\x02\n\x06Header\x12\x13\n\x0breceiver_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x39\n\rchunk_context\x18\x04 \x01(\x0b\x32\".src.commons.ChunkComponent\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x11\n\tsender_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nmessage_id\x18\n \x01(\t\x12.\n\x08metadata\x18\x0b \x01(\x0b\x32\x1c.src.commons.Metadata\x1a{\n\x0b\x46\x65\x65\x64Message\x12\x45\n\x06header\x18\x01 \x01(\x0b\x32\x35.src.feed.response.MessageQueryResponse.Header\x12%\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\"\x96\x03\n\x1a\x46\x61iledMessageQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12K\n\x06header\x18\x03 \x01(\x0b\x32;.src.feed.response.FailedMessageQueryResponse.Header\x12,\n\x07reasons\x18\x04 \x03(\x0b\x32\x1b.src.commons.Message\x1a\x8f\x01\n\x06Header\x12\x1e\n\x16technical_message_type\x18\x01 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x02 \x01(\t\x12\x14\n\x0cpayload_size\x18\x03 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestampb\x06proto3' + serialized_pb=b'\n3messaging/response/payload/feed/feed-response.proto\x12\x18\x61grirouter.feed.response\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19google/protobuf/any.proto\x1a\x15\x63ommons/message.proto\x1a\x13\x63ommons/chunk.proto\"%\n\x04Page\x12\x0e\n\x06number\x18\x01 \x01(\x05\x12\r\n\x05total\x18\x02 \x01(\x05\"N\n\x0cQueryMetrics\x12\x1f\n\x17total_messages_in_query\x18\x01 \x01(\x05\x12\x1d\n\x15max_count_restriction\x18\x02 \x01(\x05\"\xe8\x05\n\x13HeaderQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12:\n\x0e\x63hunk_contexts\x18\x03 \x03(\x0b\x32\".src.agrirouter.commons.ChunkComponent\x12@\n\x04\x66\x65\x65\x64\x18\x04 \x03(\x0b\x32\x32.src.feed.response.HeaderQueryResponse.Feed\x12\x1f\n\x13pending_message_ids\x18\x05 \x03(\tB\x02\x18\x01\x1a\xcd\x02\n\x06Header\x12\x12\n\nmessage_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x18\n\x10\x63hunk_context_id\x18\x04 \x01(\t\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x15\n\rcurrent_chunk\x18\x08 \x01(\x03\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\x08metadata\x18\n \x01(\x0b\x32\x1c.src.commons.Metadata\x1au\n\x04\x46\x65\x65\x64\x12\x11\n\tsender_id\x18\x01 \x01(\t\x12\x13\n\x0breceiver_id\x18\x02 \x01(\t\x12\x45\n\x07headers\x18\x03 \x03(\x0b\x32\x34.src.feed.response.HeaderQueryResponse.Header\"\xd0\x05\n\x14MessageQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12L\n\x08messages\x18\x03 \x03(\x0b\x32:.src.feed.response.MessageQueryResponse.FeedMessage\x1a\xff\x02\n\x06Header\x12\x13\n\x0breceiver_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x39\n\rchunk_context\x18\x04 \x01(\x0b\x32\".src.agrirouter.commons.ChunkComponent\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x11\n\tsender_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nmessage_id\x18\n \x01(\t\x12.\n\x08metadata\x18\x0b \x01(\x0b\x32\x1c.src.commons.Metadata\x1a{\n\x0b\x46\x65\x65\x64Message\x12\x45\n\x06header\x18\x01 \x01(\x0b\x32\x35.src.feed.response.MessageQueryResponse.Header\x12%\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\"\x96\x03\n\x1a\x46\x61iledMessageQueryResponse\x12=\n\rquery_metrics\x18\x01 \x01(\x0b\x32&.src.feed.response.QueryMetrics\x12,\n\x04page\x18\x02 \x01(\x0b\x32\x1e.src.feed.response.Page\x12K\n\x06header\x18\x03 \x01(\x0b\x32;.src.feed.response.FailedMessageQueryResponse.Header\x12,\n\x07reasons\x18\x04 \x03(\x0b\x32\x1b.src.commons.Message\x1a\x8f\x01\n\x06Header\x12\x1e\n\x16technical_message_type\x18\x01 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x02 \x01(\t\x12\x14\n\x0cpayload_size\x18\x03 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestampb\x06proto3' , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR, google_dot_protobuf_dot_any__pb2.DESCRIPTOR, commons_dot_message__pb2.DESCRIPTOR, commons_dot_chunk__pb2.DESCRIPTOR, ]) diff --git a/src/generated/messaging/response/payload/feed/push_notification_pb2.py b/src/agrirouter/generated/messaging/response/payload/feed/push_notification_pb2.py similarity index 93% rename from src/generated/messaging/response/payload/feed/push_notification_pb2.py rename to src/agrirouter/generated/messaging/response/payload/feed/push_notification_pb2.py index a8e9acf..25b623f 100644 --- a/src/generated/messaging/response/payload/feed/push_notification_pb2.py +++ b/src/agrirouter/generated/messaging/response/payload/feed/push_notification_pb2.py @@ -13,8 +13,8 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -from src.generated.commons import message_pb2 as commons_dot_message__pb2 -from src.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 +from src.agrirouter.generated.commons import message_pb2 as commons_dot_message__pb2 +from src.agrirouter.generated.commons import chunk_pb2 as commons_dot_chunk__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='messaging/response/payload/feed/push-notification.proto', @@ -22,7 +22,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n7messaging/response/payload/feed/push-notification.proto\x12!src.feed.push.notification\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19google/protobuf/any.proto\x1a\x15\x63ommons/message.proto\x1a\x13\x63ommons/chunk.proto\"\xea\x04\n\x10PushNotification\x12Q\n\x08messages\x18\x01 \x03(\x0b\x32?.src.feed.push.notification.PushNotification.FeedMessage\x1a\xff\x02\n\x06Header\x12\x13\n\x0breceiver_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x39\n\rchunk_context\x18\x04 \x01(\x0b\x32\".src.commons.ChunkComponent\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x11\n\tsender_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nmessage_id\x18\n \x01(\t\x12.\n\x08metadata\x18\x0b \x01(\x0b\x32\x1c.src.commons.Metadata\x1a\x80\x01\n\x0b\x46\x65\x65\x64Message\x12J\n\x06header\x18\x01 \x01(\x0b\x32:.src.feed.push.notification.PushNotification.Header\x12%\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Anyb\x06proto3' + serialized_pb=b'\n7messaging/response/payload/feed/push-notification.proto\x12!src.feed.push.notification\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x19google/protobuf/any.proto\x1a\x15\x63ommons/message.proto\x1a\x13\x63ommons/chunk.proto\"\xea\x04\n\x10PushNotification\x12Q\n\x08messages\x18\x01 \x03(\x0b\x32?.src.feed.push.notification.PushNotification.FeedMessage\x1a\xff\x02\n\x06Header\x12\x13\n\x0breceiver_id\x18\x01 \x01(\t\x12\x1e\n\x16technical_message_type\x18\x02 \x01(\t\x12\x1b\n\x13team_set_context_id\x18\x03 \x01(\t\x12\x39\n\rchunk_context\x18\x04 \x01(\x0b\x32\".src.agrirouter.commons.ChunkComponent\x12\x14\n\x0cpayload_size\x18\x05 \x01(\x03\x12\x32\n\x0esent_timestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\x0fsequence_number\x18\x07 \x01(\x03\x12\x11\n\tsender_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nmessage_id\x18\n \x01(\t\x12.\n\x08metadata\x18\x0b \x01(\x0b\x32\x1c.src.commons.Metadata\x1a\x80\x01\n\x0b\x46\x65\x65\x64Message\x12J\n\x06header\x18\x01 \x01(\x0b\x32:.src.feed.push.notification.PushNotification.Header\x12%\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Anyb\x06proto3' , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR, google_dot_protobuf_dot_any__pb2.DESCRIPTOR, commons_dot_message__pb2.DESCRIPTOR, commons_dot_chunk__pb2.DESCRIPTOR, ]) diff --git a/src/generated/messaging/response/response_pb2.py b/src/agrirouter/generated/messaging/response/response_pb2.py similarity index 100% rename from src/generated/messaging/response/response_pb2.py rename to src/agrirouter/generated/messaging/response/response_pb2.py diff --git a/src/messaging/__init__.py b/src/agrirouter/generated/settings/__init__.py similarity index 100% rename from src/messaging/__init__.py rename to src/agrirouter/generated/settings/__init__.py diff --git a/src/generated/settings/dh_settings_pb2.py b/src/agrirouter/generated/settings/dh_settings_pb2.py similarity index 100% rename from src/generated/settings/dh_settings_pb2.py rename to src/agrirouter/generated/settings/dh_settings_pb2.py diff --git a/src/messaging/clients/__init__.py b/src/agrirouter/messaging/__init__.py similarity index 100% rename from src/messaging/clients/__init__.py rename to src/agrirouter/messaging/__init__.py diff --git a/src/messaging/builders.py b/src/agrirouter/messaging/builders.py similarity index 96% rename from src/messaging/builders.py rename to src/agrirouter/messaging/builders.py index 841424b..8918224 100644 --- a/src/messaging/builders.py +++ b/src/agrirouter/messaging/builders.py @@ -1,8 +1,8 @@ from typing import List -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.api.enums import CapabilityType +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.api.enums import CapabilityType class SubscriptionItemBuilder: diff --git a/src/messaging/certification.py b/src/agrirouter/messaging/certification.py similarity index 88% rename from src/messaging/certification.py rename to src/agrirouter/messaging/certification.py index 1b8eabe..2457df2 100644 --- a/src/messaging/certification.py +++ b/src/agrirouter/messaging/certification.py @@ -1,7 +1,7 @@ import os import tempfile -from src.onboarding.response import OnboardResponse +from src.agrirouter.onboarding.response import OnboardResponse def create_certificate_file_from_pen(onboard_response: OnboardResponse): diff --git a/src/messaging/parameters/__init__.py b/src/agrirouter/messaging/clients/__init__.py similarity index 100% rename from src/messaging/parameters/__init__.py rename to src/agrirouter/messaging/clients/__init__.py diff --git a/src/messaging/clients/constants.py b/src/agrirouter/messaging/clients/constants.py similarity index 100% rename from src/messaging/clients/constants.py rename to src/agrirouter/messaging/clients/constants.py diff --git a/src/messaging/clients/http.py b/src/agrirouter/messaging/clients/http.py similarity index 94% rename from src/messaging/clients/http.py rename to src/agrirouter/messaging/clients/http.py index c2d2696..8462a03 100644 --- a/src/messaging/clients/http.py +++ b/src/agrirouter/messaging/clients/http.py @@ -4,8 +4,8 @@ import ssl from urllib.parse import urlparse -from src.messaging.certification import create_certificate_file_from_pen -from src.onboarding.response import OnboardResponse +from src.agrirouter.messaging.certification import create_certificate_file_from_pen +from src.agrirouter.onboarding.response import OnboardResponse class HttpClient: diff --git a/src/messaging/clients/mqtt.py b/src/agrirouter/messaging/clients/mqtt.py similarity index 97% rename from src/messaging/clients/mqtt.py rename to src/agrirouter/messaging/clients/mqtt.py index 1cd8cac..134d437 100644 --- a/src/messaging/clients/mqtt.py +++ b/src/agrirouter/messaging/clients/mqtt.py @@ -6,8 +6,8 @@ import paho.mqtt.client as mqtt_client from paho.mqtt.client import MQTTv31, MQTTMessageInfo -from src.messaging.certification import create_certificate_file_from_pen -from src.messaging.clients.constants import SYNC, ASYNC +from src.agrirouter.messaging.certification import create_certificate_file_from_pen +from src.agrirouter.messaging.clients.constants import SYNC, ASYNC class MqttClient: diff --git a/src/messaging/decode.py b/src/agrirouter/messaging/decode.py similarity index 78% rename from src/messaging/decode.py rename to src/agrirouter/messaging/decode.py index a6cf7fb..809b0e6 100644 --- a/src/messaging/decode.py +++ b/src/agrirouter/messaging/decode.py @@ -4,15 +4,15 @@ from google.protobuf.any_pb2 import Any from google.protobuf.internal.decoder import _DecodeVarint -from src.generated.commons.message_pb2 import Messages -from src.generated.messaging.response.payload.account.endpoints_pb2 import ListEndpointsResponse -from src.generated.messaging.response.payload.feed.feed_response_pb2 import HeaderQueryResponse, \ +from src.agrirouter.generated.commons.message_pb2 import Messages +from src.agrirouter.generated.messaging.response.payload.account.endpoints_pb2 import ListEndpointsResponse +from src.agrirouter.generated.messaging.response.payload.feed.feed_response_pb2 import HeaderQueryResponse, \ MessageQueryResponse -from src.generated.messaging.response.payload.feed.push_notification_pb2 import PushNotification -from src.generated.messaging.response.response_pb2 import ResponseEnvelope, ResponsePayloadWrapper -from src.api.exceptions import CanNotDecodeMessage -from src.messaging.messages import DecodedMessage -from src.utils.type_url import TypeUrl +from src.agrirouter.generated.messaging.response.payload.feed.push_notification_pb2 import PushNotification +from src.agrirouter.generated.messaging.response.response_pb2 import ResponseEnvelope, ResponsePayloadWrapper +from src.agrirouter.api.exceptions import CanNotDecodeMessage +from src.agrirouter.messaging.messages import DecodedMessage +from src.agrirouter.utils.type_url import TypeUrl def read_properties_buffers_from_input_stream(input_stream) -> tuple: diff --git a/src/messaging/encode.py b/src/agrirouter/messaging/encode.py similarity index 91% rename from src/messaging/encode.py rename to src/agrirouter/messaging/encode.py index e8362cf..15dfc5b 100644 --- a/src/messaging/encode.py +++ b/src/agrirouter/messaging/encode.py @@ -5,14 +5,14 @@ from google.protobuf.any_pb2 import Any from google.protobuf.internal.encoder import _VarintBytes -from src.generated.commons.chunk_pb2 import ChunkComponent -from src.generated.messaging.request.request_pb2 import RequestEnvelope, RequestPayloadWrapper -from src.messaging.messages import MessageParameterTuple -from src.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.utc_time_util import now_as_utc_timestamp -from src.utils.uuid_util import new_uuid +from src.agrirouter.generated.commons.chunk_pb2 import ChunkComponent +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope, RequestPayloadWrapper +from src.agrirouter.messaging.messages import MessageParameterTuple +from src.agrirouter.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.utc_time_util import now_as_utc_timestamp +from src.agrirouter.utils.uuid_util import new_uuid MAX_LENGTH_FOR_RAW_MESSAGE_CONTENT = 767997 // 2 log = logging.getLogger("com.dke.data.src.sdk.encode") diff --git a/src/messaging/messages.py b/src/agrirouter/messaging/messages.py similarity index 96% rename from src/messaging/messages.py rename to src/agrirouter/messaging/messages.py index e16096e..de57c91 100644 --- a/src/messaging/messages.py +++ b/src/agrirouter/messaging/messages.py @@ -1,8 +1,8 @@ import json from typing import Union, Dict -from src.api.exceptions import WrongField -from src.utils.utc_time_util import now_as_utc_str +from src.agrirouter.api.exceptions import WrongField +from src.agrirouter.utils.utc_time_util import now_as_utc_str class EncodedMessage: diff --git a/src/messaging/services/__init__.py b/src/agrirouter/messaging/parameters/__init__.py similarity index 100% rename from src/messaging/services/__init__.py rename to src/agrirouter/messaging/parameters/__init__.py diff --git a/src/messaging/parameters/dto.py b/src/agrirouter/messaging/parameters/dto.py similarity index 97% rename from src/messaging/parameters/dto.py rename to src/agrirouter/messaging/parameters/dto.py index 74fc584..76dc51f 100644 --- a/src/messaging/parameters/dto.py +++ b/src/agrirouter/messaging/parameters/dto.py @@ -1,9 +1,9 @@ from copy import deepcopy from typing import List -from src.generated.commons.chunk_pb2 import ChunkComponent -from src.messaging.messages import EncodedMessage -from src.onboarding.response import BaseOnboardingResponse +from src.agrirouter.generated.commons.chunk_pb2 import ChunkComponent +from src.agrirouter.messaging.messages import EncodedMessage +from src.agrirouter.onboarding.response import BaseOnboardingResponse class Parameters: diff --git a/src/messaging/parameters/service.py b/src/agrirouter/messaging/parameters/service.py similarity index 97% rename from src/messaging/parameters/service.py rename to src/agrirouter/messaging/parameters/service.py index b79036e..9daf03e 100644 --- a/src/messaging/parameters/service.py +++ b/src/agrirouter/messaging/parameters/service.py @@ -1,13 +1,13 @@ from copy import deepcopy from typing import List -from src.generated.commons.chunk_pb2 import ChunkComponent -from src.generated.commons.message_pb2 import Metadata -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod -from src.messaging.parameters.dto import MessageParameters, Parameters -from src.onboarding.response import BaseOnboardingResponse +from src.agrirouter.generated.commons.chunk_pb2 import ChunkComponent +from src.agrirouter.generated.commons.message_pb2 import Metadata +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod +from src.agrirouter.messaging.parameters.dto import MessageParameters, Parameters +from src.agrirouter.onboarding.response import BaseOnboardingResponse class MessageHeaderParameters(Parameters): diff --git a/src/messaging/request.py b/src/agrirouter/messaging/request.py similarity index 100% rename from src/messaging/request.py rename to src/agrirouter/messaging/request.py diff --git a/src/messaging/result.py b/src/agrirouter/messaging/result.py similarity index 96% rename from src/messaging/result.py rename to src/agrirouter/messaging/result.py index 4e60e03..8d8f652 100644 --- a/src/messaging/result.py +++ b/src/agrirouter/messaging/result.py @@ -1,7 +1,7 @@ import json from typing import List, Union -from src.messaging.messages import OutboxMessage +from src.agrirouter.messaging.messages import OutboxMessage class MessagingResult: diff --git a/src/messaging/services/http/__init__.py b/src/agrirouter/messaging/services/__init__.py similarity index 100% rename from src/messaging/services/http/__init__.py rename to src/agrirouter/messaging/services/__init__.py diff --git a/src/messaging/services/cloud.py b/src/agrirouter/messaging/services/cloud.py similarity index 77% rename from src/messaging/services/cloud.py rename to src/agrirouter/messaging/services/cloud.py index ee1316e..946404d 100644 --- a/src/messaging/services/cloud.py +++ b/src/agrirouter/messaging/services/cloud.py @@ -1,14 +1,14 @@ -from src.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingRequest, \ +from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingRequest, \ OffboardingRequest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.encode import encode_message -from src.api.enums import TechnicalMessageType -from src.messaging.messages import EncodedMessage -from src.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters, \ +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.encode import encode_message +from src.agrirouter.api.enums import TechnicalMessageType +from src.agrirouter.messaging.messages import EncodedMessage +from src.agrirouter.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters, \ CloudOnboardParameters, CloudOffboardParameters -from src.messaging.services.messaging import AbstractService -from src.utils.type_url import TypeUrl -from src.utils.uuid_util import new_uuid +from src.agrirouter.messaging.services.messaging import AbstractService +from src.agrirouter.utils.type_url import TypeUrl +from src.agrirouter.utils.uuid_util import new_uuid class CloudOnboardService(AbstractService): diff --git a/src/messaging/services/commons.py b/src/agrirouter/messaging/services/commons.py similarity index 87% rename from src/messaging/services/commons.py rename to src/agrirouter/messaging/services/commons.py index 5a0a3e2..9ef72b4 100644 --- a/src/messaging/services/commons.py +++ b/src/agrirouter/messaging/services/commons.py @@ -2,15 +2,15 @@ import logging from abc import ABC, abstractmethod -from src.api.exceptions import BadMessagingResult -from src.messaging.clients.http import HttpClient -from src.messaging.clients.mqtt import MqttClient -from src.messaging.messages import Message, EncodedMessage -from src.messaging.parameters.dto import MessagingParameters -from src.messaging.parameters.service import MessageParameters -from src.messaging.request import MessageRequest -from src.messaging.result import MessagingResult -from src.onboarding.response import OnboardResponse +from src.agrirouter.api.exceptions import BadMessagingResult +from src.agrirouter.messaging.clients.http import HttpClient +from src.agrirouter.messaging.clients.mqtt import MqttClient +from src.agrirouter.messaging.messages import Message, EncodedMessage +from src.agrirouter.messaging.parameters.dto import MessagingParameters +from src.agrirouter.messaging.parameters.service import MessageParameters +from src.agrirouter.messaging.request import MessageRequest +from src.agrirouter.messaging.result import MessagingResult +from src.agrirouter.onboarding.response import OnboardResponse class AbstractService: diff --git a/src/onboarding/__init__.py b/src/agrirouter/messaging/services/http/__init__.py similarity index 100% rename from src/onboarding/__init__.py rename to src/agrirouter/messaging/services/http/__init__.py diff --git a/src/messaging/services/http/fetch_message_service.py b/src/agrirouter/messaging/services/http/fetch_message_service.py similarity index 76% rename from src/messaging/services/http/fetch_message_service.py rename to src/agrirouter/messaging/services/http/fetch_message_service.py index a5593a9..096b50e 100644 --- a/src/messaging/services/http/fetch_message_service.py +++ b/src/agrirouter/messaging/services/http/fetch_message_service.py @@ -1,6 +1,6 @@ -from src.messaging.clients.http import HttpClient -from src.api.exceptions import CanNotFetchOutboxMessage -from src.messaging.result import OutboxResponse +from src.agrirouter.messaging.clients.http import HttpClient +from src.agrirouter.api.exceptions import CanNotFetchOutboxMessage +from src.agrirouter.messaging.result import OutboxResponse class FetchMessageService: diff --git a/src/messaging/services/messaging.py b/src/agrirouter/messaging/services/messaging.py similarity index 92% rename from src/messaging/services/messaging.py rename to src/agrirouter/messaging/services/messaging.py index bf53ceb..e312d3b 100644 --- a/src/messaging/services/messaging.py +++ b/src/agrirouter/messaging/services/messaging.py @@ -1,23 +1,23 @@ -from src.api.enums import TechnicalMessageType, CapabilityType -from src.generated.commons.chunk_pb2 import ChunkComponent -from src.generated.commons.message_pb2 import Metadata -from src.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery -from src.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageConfirm, MessageDelete, \ +from src.agrirouter.api.enums import TechnicalMessageType, CapabilityType +from src.agrirouter.generated.commons.chunk_pb2 import ChunkComponent +from src.agrirouter.generated.commons.message_pb2 import Metadata +from src.agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery +from src.agrirouter.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageConfirm, MessageDelete, \ MessageQuery -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.encode import encode_message -from src.messaging.messages import EncodedMessage -from src.messaging.parameters.dto import SendMessageParameters, ChunkedMessageParameters -from src.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters, \ +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.encode import encode_message +from src.agrirouter.messaging.messages import EncodedMessage +from src.agrirouter.messaging.parameters.dto import SendMessageParameters, ChunkedMessageParameters +from src.agrirouter.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters, \ CapabilitiesParameters, FeedConfirmParameters, FeedDeleteParameters, ListEndpointsParameters, \ SubscriptionParameters, QueryHeaderParameters, QueryMessageParameters, ImageParameters, TaskParameters, \ EfdiParameters -from src.messaging.services.commons import AbstractService -from src.utils.type_url import TypeUrl -from src.utils.uuid_util import new_uuid +from src.agrirouter.messaging.services.commons import AbstractService +from src.agrirouter.utils.type_url import TypeUrl +from src.agrirouter.utils.uuid_util import new_uuid class CapabilitiesService(AbstractService): diff --git a/src/messaging/services/sequence_number_service.py b/src/agrirouter/messaging/services/sequence_number_service.py similarity index 100% rename from src/messaging/services/sequence_number_service.py rename to src/agrirouter/messaging/services/sequence_number_service.py diff --git a/src/revoking/__init__.py b/src/agrirouter/onboarding/__init__.py similarity index 100% rename from src/revoking/__init__.py rename to src/agrirouter/onboarding/__init__.py diff --git a/src/onboarding/dto.py b/src/agrirouter/onboarding/dto.py similarity index 99% rename from src/onboarding/dto.py rename to src/agrirouter/onboarding/dto.py index 87d333d..0fad0d4 100644 --- a/src/onboarding/dto.py +++ b/src/agrirouter/onboarding/dto.py @@ -1,7 +1,7 @@ import json from typing import Union -from src.api.exceptions import WrongField +from src.agrirouter.api.exceptions import WrongField class ConnectionCriteria: diff --git a/src/onboarding/enums.py b/src/agrirouter/onboarding/enums.py similarity index 73% rename from src/onboarding/enums.py rename to src/agrirouter/onboarding/enums.py index d8e2d3e..fbcb77a 100644 --- a/src/onboarding/enums.py +++ b/src/agrirouter/onboarding/enums.py @@ -1,4 +1,4 @@ -from src.api.enums import BaseEnum +from src.agrirouter.api.enums import BaseEnum class CertificateTypes(BaseEnum): diff --git a/src/onboarding/headers.py b/src/agrirouter/onboarding/headers.py similarity index 91% rename from src/onboarding/headers.py rename to src/agrirouter/onboarding/headers.py index 16b9f66..bb90308 100644 --- a/src/onboarding/headers.py +++ b/src/agrirouter/onboarding/headers.py @@ -1,7 +1,7 @@ import logging -from src.api.enums import ContentTypes, RequestHeaders -from src.api.exceptions import MissingRegistrationCode +from src.agrirouter.api.enums import ContentTypes, RequestHeaders +from src.agrirouter.api.exceptions import MissingRegistrationCode class SoftwareOnboardingHeader: diff --git a/src/onboarding/parameters.py b/src/agrirouter/onboarding/parameters.py similarity index 89% rename from src/onboarding/parameters.py rename to src/agrirouter/onboarding/parameters.py index 9f30f04..48cfdeb 100644 --- a/src/onboarding/parameters.py +++ b/src/agrirouter/onboarding/parameters.py @@ -1,6 +1,6 @@ -from src.api.enums import ContentTypes -from src.onboarding.enums import CertificateTypes -from src.utils.utc_time_util import now_as_utc_str +from src.agrirouter.api.enums import ContentTypes +from src.agrirouter.onboarding.enums import CertificateTypes +from src.agrirouter.utils.utc_time_util import now_as_utc_str class OnboardParameters: diff --git a/src/onboarding/request.py b/src/agrirouter/onboarding/request.py similarity index 78% rename from src/onboarding/request.py rename to src/agrirouter/onboarding/request.py index dd63662..ab22992 100644 --- a/src/onboarding/request.py +++ b/src/agrirouter/onboarding/request.py @@ -1,8 +1,8 @@ -from src.api.enums import RequestHeaders -from src.onboarding.headers import SoftwareOnboardingHeader -from src.onboarding.parameters import OnboardParameters -from src.onboarding.request_body import SoftwareOnboardingBody -from src.onboarding.signature import create_signature, verify_signature +from src.agrirouter.api.enums import RequestHeaders +from src.agrirouter.onboarding.headers import SoftwareOnboardingHeader +from src.agrirouter.onboarding.parameters import OnboardParameters +from src.agrirouter.onboarding.request_body import SoftwareOnboardingBody +from src.agrirouter.onboarding.signature import create_signature, verify_signature class OnboardRequest: diff --git a/src/onboarding/request_body.py b/src/agrirouter/onboarding/request_body.py similarity index 92% rename from src/onboarding/request_body.py rename to src/agrirouter/onboarding/request_body.py index 4b94493..e14b9d5 100644 --- a/src/onboarding/request_body.py +++ b/src/agrirouter/onboarding/request_body.py @@ -1,8 +1,8 @@ import json from datetime import datetime -from src.api.exceptions import WrongCertificationType, WrongGateWayType -from src.onboarding.enums import CertificateTypes, Gateways +from src.agrirouter.api.exceptions import WrongCertificationType, WrongGateWayType +from src.agrirouter.onboarding.enums import CertificateTypes, Gateways class SoftwareOnboardingBody: diff --git a/src/onboarding/response.py b/src/agrirouter/onboarding/response.py similarity index 97% rename from src/onboarding/response.py rename to src/agrirouter/onboarding/response.py index 52b6426..516ff65 100644 --- a/src/onboarding/response.py +++ b/src/agrirouter/onboarding/response.py @@ -3,8 +3,8 @@ from requests import Response -from src.api.exceptions import WrongField -from src.onboarding.dto import ErrorResponse, ConnectionCriteria, Authentication +from src.agrirouter.api.exceptions import WrongField +from src.agrirouter.onboarding.dto import ErrorResponse, ConnectionCriteria, Authentication class BaseOnboardingResponse: diff --git a/src/onboarding/onboarding.py b/src/agrirouter/onboarding/services.py similarity index 82% rename from src/onboarding/onboarding.py rename to src/agrirouter/onboarding/services.py index c47076a..bf70a35 100644 --- a/src/onboarding/onboarding.py +++ b/src/agrirouter/onboarding/services.py @@ -1,13 +1,13 @@ import requests -from src.api.environments import BaseEnvironment -from src.api.exceptions import UnexpectedErrorDuringOnboarding, RequestNotSigned -from src.environments.environmental_services import EnvironmentalService -from src.onboarding.headers import SoftwareOnboardingHeader -from src.onboarding.parameters import OnboardParameters -from src.onboarding.request import OnboardRequest -from src.onboarding.request_body import SoftwareOnboardingBody -from src.onboarding.response import VerificationResponse, OnboardResponse +from src.agrirouter.api.environments import BaseEnvironment +from src.agrirouter.api.exceptions import UnexpectedErrorDuringOnboarding, RequestNotSigned +from src.agrirouter.environments.environmental_services import EnvironmentalService +from src.agrirouter.onboarding.headers import SoftwareOnboardingHeader +from src.agrirouter.onboarding.parameters import OnboardParameters +from src.agrirouter.onboarding.request import OnboardRequest +from src.agrirouter.onboarding.request_body import SoftwareOnboardingBody +from src.agrirouter.onboarding.response import VerificationResponse, OnboardResponse class SecuredOnboardingService(EnvironmentalService): diff --git a/src/onboarding/signature.py b/src/agrirouter/onboarding/signature.py similarity index 100% rename from src/onboarding/signature.py rename to src/agrirouter/onboarding/signature.py diff --git a/src/utils/__init__.py b/src/agrirouter/revoking/__init__.py similarity index 100% rename from src/utils/__init__.py rename to src/agrirouter/revoking/__init__.py diff --git a/src/revoking/headers.py b/src/agrirouter/revoking/headers.py similarity index 93% rename from src/revoking/headers.py rename to src/agrirouter/revoking/headers.py index 5b518bf..43fd18f 100644 --- a/src/revoking/headers.py +++ b/src/agrirouter/revoking/headers.py @@ -1,4 +1,4 @@ -from src.api.enums import ContentTypes +from src.agrirouter.api.enums import ContentTypes class RevokingHeader: diff --git a/src/revoking/parameters.py b/src/agrirouter/revoking/parameters.py similarity index 94% rename from src/revoking/parameters.py rename to src/agrirouter/revoking/parameters.py index db1dc67..37a954d 100644 --- a/src/revoking/parameters.py +++ b/src/agrirouter/revoking/parameters.py @@ -1,4 +1,4 @@ -from src.api.enums import ContentTypes +from src.agrirouter.api.enums import ContentTypes class RevokingParameter: diff --git a/src/revoking/request.py b/src/agrirouter/revoking/request.py similarity index 81% rename from src/revoking/request.py rename to src/agrirouter/revoking/request.py index 635bb8f..097ea2e 100644 --- a/src/revoking/request.py +++ b/src/agrirouter/revoking/request.py @@ -1,6 +1,6 @@ -from src.onboarding.signature import create_signature -from src.revoking.headers import RevokingHeader -from src.revoking.request_body import RevokingBody +from src.agrirouter.onboarding.signature import create_signature +from src.agrirouter.revoking.headers import RevokingHeader +from src.agrirouter.revoking.request_body import RevokingBody class RevokingRequest: diff --git a/src/revoking/request_body.py b/src/agrirouter/revoking/request_body.py similarity index 100% rename from src/revoking/request_body.py rename to src/agrirouter/revoking/request_body.py diff --git a/src/revoking/response.py b/src/agrirouter/revoking/response.py similarity index 100% rename from src/revoking/response.py rename to src/agrirouter/revoking/response.py diff --git a/src/revoking/revoking.py b/src/agrirouter/revoking/revoking.py similarity index 74% rename from src/revoking/revoking.py rename to src/agrirouter/revoking/revoking.py index 360e0ca..f1df330 100644 --- a/src/revoking/revoking.py +++ b/src/agrirouter/revoking/revoking.py @@ -1,12 +1,12 @@ import requests -from src.environments.environmental_services import EnvironmentalService -from src.api.exceptions import RequestNotSigned -from src.revoking.headers import RevokingHeader -from src.revoking.parameters import RevokingParameter -from src.revoking.request import RevokingRequest -from src.revoking.request_body import RevokingBody -from src.revoking.response import RevokingResponse +from src.agrirouter.environments.environmental_services import EnvironmentalService +from src.agrirouter.api.exceptions import RequestNotSigned +from src.agrirouter.revoking.headers import RevokingHeader +from src.agrirouter.revoking.parameters import RevokingParameter +from src.agrirouter.revoking.request import RevokingRequest +from src.agrirouter.revoking.request_body import RevokingBody +from src.agrirouter.revoking.response import RevokingResponse class Revoking(EnvironmentalService): diff --git a/tests/common/__init__.py b/src/agrirouter/utils/__init__.py similarity index 100% rename from tests/common/__init__.py rename to src/agrirouter/utils/__init__.py diff --git a/src/agrirouter/utils/type_url.py b/src/agrirouter/utils/type_url.py new file mode 100644 index 0000000..688987e --- /dev/null +++ b/src/agrirouter/utils/type_url.py @@ -0,0 +1,47 @@ +from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingResponse, \ + OnboardingRequest +from src.agrirouter.generated.commons.message_pb2 import Messages +from src.agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageDelete, MessageConfirm, \ + MessageQuery +from src.agrirouter.generated.messaging.response.payload.account.endpoints_pb2 import ListEndpointsResponse +from src.agrirouter.generated.messaging.response.payload.feed.feed_response_pb2 import HeaderQueryResponse, \ + MessageQueryResponse + +from src.agrirouter.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData + +from src.agrirouter.generated.messaging.response.payload.feed.push_notification_pb2 import PushNotification +from src.agrirouter.api.exceptions import TypeUrlNotFound + + +class TypeUrl: + prefix = "types.src.com/" + commands = ( + Messages, + ListEndpointsResponse, + HeaderQueryResponse, + MessageQueryResponse, + MessageDelete, + MessageConfirm, + OnboardingResponse, + OnboardingRequest, + CapabilitySpecification, + Subscription, + MessageQuery, + ListEndpointsQuery, + PushNotification, + TimeLog, + ISO11783_TaskData + ) + + @classmethod + def get_type_url(cls, class_): + return TypeUrl.get_command(class_) + + @classmethod + def get_command(cls, class_) -> str: + if class_ not in cls.commands: + raise TypeUrlNotFound(f"The {class_} type url not found") + return cls.prefix + class_.DESCRIPTOR.full_name diff --git a/src/utils/utc_time_util.py b/src/agrirouter/utils/utc_time_util.py similarity index 95% rename from src/utils/utc_time_util.py rename to src/agrirouter/utils/utc_time_util.py index a72d559..c2728a9 100644 --- a/src/utils/utc_time_util.py +++ b/src/agrirouter/utils/utc_time_util.py @@ -2,7 +2,7 @@ from google.protobuf.timestamp_pb2 import Timestamp -from src.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod +from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod def now_as_utc_timestamp() -> datetime: diff --git a/src/utils/uuid_util.py b/src/agrirouter/utils/uuid_util.py similarity index 100% rename from src/utils/uuid_util.py rename to src/agrirouter/utils/uuid_util.py diff --git a/src/utils/type_url.py b/src/utils/type_url.py deleted file mode 100644 index 3c499b7..0000000 --- a/src/utils/type_url.py +++ /dev/null @@ -1,47 +0,0 @@ -from src.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingResponse, \ - OnboardingRequest -from src.generated.commons.message_pb2 import Messages -from src.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageDelete, MessageConfirm, \ - MessageQuery -from src.generated.messaging.response.payload.account.endpoints_pb2 import ListEndpointsResponse -from src.generated.messaging.response.payload.feed.feed_response_pb2 import HeaderQueryResponse, \ - MessageQueryResponse - -from src.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData - -from src.generated.messaging.response.payload.feed.push_notification_pb2 import PushNotification -from src.api.exceptions import TypeUrlNotFound - - -class TypeUrl: - prefix = "types.src.com/" - commands = ( - Messages, - ListEndpointsResponse, - HeaderQueryResponse, - MessageQueryResponse, - MessageDelete, - MessageConfirm, - OnboardingResponse, - OnboardingRequest, - CapabilitySpecification, - Subscription, - MessageQuery, - ListEndpointsQuery, - PushNotification, - TimeLog, - ISO11783_TaskData - ) - - @classmethod - def get_type_url(cls, class_): - return TypeUrl.get_command(class_) - - @classmethod - def get_command(cls, class_) -> str: - if class_ not in cls.commands: - raise TypeUrlNotFound(f"The {class_} type url not found") - return cls.prefix + class_.DESCRIPTOR.full_name diff --git a/tests/data/__init__.py b/tests/agrirouter/__init__.py similarity index 100% rename from tests/data/__init__.py rename to tests/agrirouter/__init__.py diff --git a/tests/fixtures/__init__.py b/tests/agrirouter/common/__init__.py similarity index 100% rename from tests/fixtures/__init__.py rename to tests/agrirouter/common/__init__.py diff --git a/tests/common/constants.py b/tests/agrirouter/common/constants.py similarity index 100% rename from tests/common/constants.py rename to tests/agrirouter/common/constants.py diff --git a/tests/common/data_provider.py b/tests/agrirouter/common/data_provider.py similarity index 100% rename from tests/common/data_provider.py rename to tests/agrirouter/common/data_provider.py diff --git a/tests/common/onboarding.py b/tests/agrirouter/common/onboarding.py similarity index 91% rename from tests/common/onboarding.py rename to tests/agrirouter/common/onboarding.py index 40384f5..38fa9de 100644 --- a/tests/common/onboarding.py +++ b/tests/agrirouter/common/onboarding.py @@ -1,6 +1,6 @@ from src import OnboardingService, OnboardParameters -from src.onboarding.response import OnboardResponse -from tests.data.applications import CommunicationUnit +from src.agrirouter.onboarding.response import OnboardResponse +from tests.agrirouter.data.applications import CommunicationUnit def onboard_communication_unit(uuid: str, _environment, registration_code: str, diff --git a/tests/common/sleeper.py b/tests/agrirouter/common/sleeper.py similarity index 100% rename from tests/common/sleeper.py rename to tests/agrirouter/common/sleeper.py diff --git a/tests/internal/__init__.py b/tests/agrirouter/data/__init__.py similarity index 100% rename from tests/internal/__init__.py rename to tests/agrirouter/data/__init__.py diff --git a/tests/data/applications.py b/tests/agrirouter/data/applications.py similarity index 100% rename from tests/data/applications.py rename to tests/agrirouter/data/applications.py diff --git a/tests/data/content/example.png b/tests/agrirouter/data/content/example.png similarity index 100% rename from tests/data/content/example.png rename to tests/agrirouter/data/content/example.png diff --git a/tests/data/content/large_bmp.bmp b/tests/agrirouter/data/content/large_bmp.bmp similarity index 100% rename from tests/data/content/large_bmp.bmp rename to tests/agrirouter/data/content/large_bmp.bmp diff --git a/tests/data/content/large_shape.zip b/tests/agrirouter/data/content/large_shape.zip similarity index 100% rename from tests/data/content/large_shape.zip rename to tests/agrirouter/data/content/large_shape.zip diff --git a/tests/data/content/small_shape.zip b/tests/agrirouter/data/content/small_shape.zip similarity index 100% rename from tests/data/content/small_shape.zip rename to tests/agrirouter/data/content/small_shape.zip diff --git a/tests/data/content/small_taskdata.zip b/tests/agrirouter/data/content/small_taskdata.zip similarity index 100% rename from tests/data/content/small_taskdata.zip rename to tests/agrirouter/data/content/small_taskdata.zip diff --git a/tests/data/identifier.py b/tests/agrirouter/data/identifier.py similarity index 100% rename from tests/data/identifier.py rename to tests/agrirouter/data/identifier.py diff --git a/tests/data/onboard_response_integration_service.py b/tests/agrirouter/data/onboard_response_integration_service.py similarity index 94% rename from tests/data/onboard_response_integration_service.py rename to tests/agrirouter/data/onboard_response_integration_service.py index 4898077..68f0dee 100644 --- a/tests/data/onboard_response_integration_service.py +++ b/tests/agrirouter/data/onboard_response_integration_service.py @@ -2,7 +2,7 @@ import os import tests -from src.onboarding.response import OnboardResponse +from src.agrirouter.onboarding.response import OnboardResponse def read_onboard_response(identifier: str) -> OnboardResponse: diff --git a/tests/data/onboarding_responses/Http/CommunicationUnit/PEM/Recipient.json b/tests/agrirouter/data/onboarding_responses/Http/CommunicationUnit/PEM/Recipient.json similarity index 100% rename from tests/data/onboarding_responses/Http/CommunicationUnit/PEM/Recipient.json rename to tests/agrirouter/data/onboarding_responses/Http/CommunicationUnit/PEM/Recipient.json diff --git a/tests/data/onboarding_responses/Http/CommunicationUnit/PEM/Sender.json b/tests/agrirouter/data/onboarding_responses/Http/CommunicationUnit/PEM/Sender.json similarity index 100% rename from tests/data/onboarding_responses/Http/CommunicationUnit/PEM/Sender.json rename to tests/agrirouter/data/onboarding_responses/Http/CommunicationUnit/PEM/Sender.json diff --git a/tests/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Recipient.json b/tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Recipient.json similarity index 100% rename from tests/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Recipient.json rename to tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Recipient.json diff --git a/tests/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Sender.json b/tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Sender.json similarity index 100% rename from tests/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Sender.json rename to tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/Messages/Sender.json diff --git a/tests/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Recipient.json b/tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Recipient.json similarity index 100% rename from tests/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Recipient.json rename to tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Recipient.json diff --git a/tests/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Sender.json b/tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Sender.json similarity index 100% rename from tests/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Sender.json rename to tests/agrirouter/data/onboarding_responses/Mqtt/CommunicationUnit/PEM/Sender.json diff --git a/tests/data/onboarding_responses/test.json b/tests/agrirouter/data/onboarding_responses/test.json similarity index 100% rename from tests/data/onboarding_responses/test.json rename to tests/agrirouter/data/onboarding_responses/test.json diff --git a/tests/internal/auth_test/__init__.py b/tests/agrirouter/fixtures/__init__.py similarity index 100% rename from tests/internal/auth_test/__init__.py rename to tests/agrirouter/fixtures/__init__.py diff --git a/tests/fixtures/update_http_onboard_responses.py b/tests/agrirouter/fixtures/update_http_onboard_responses.py similarity index 88% rename from tests/fixtures/update_http_onboard_responses.py rename to tests/agrirouter/fixtures/update_http_onboard_responses.py index 9b95501..0ee8a67 100644 --- a/tests/fixtures/update_http_onboard_responses.py +++ b/tests/agrirouter/fixtures/update_http_onboard_responses.py @@ -6,17 +6,17 @@ from onboard_response_integration_service import save_onboard_response from src import CapabilitiesService, CapabilitiesParameters -from src.api.environments import Qa -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.api.enums import CapabilityType, CapabilityDirectionType -from src.messaging.services.commons import HttpMessagingService -from src.messaging.services.http.fetch_message_service import FetchMessageService -from src.onboarding.enums import CertificateTypes, Gateways -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.onboarding import onboard_communication_unit -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier +from src.agrirouter.api.environments import Qa +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.api.enums import CapabilityType, CapabilityDirectionType +from src.agrirouter.messaging.services.commons import HttpMessagingService +from src.agrirouter.messaging.services.http.fetch_message_service import FetchMessageService +from src.agrirouter.onboarding.enums import CertificateTypes, Gateways +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.onboarding import onboard_communication_unit +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier class OnboardResponseUpdate(unittest.TestCase): diff --git a/tests/fixtures/update_mqtt_onboard_responses.py b/tests/agrirouter/fixtures/update_mqtt_onboard_responses.py similarity index 84% rename from tests/fixtures/update_mqtt_onboard_responses.py rename to tests/agrirouter/fixtures/update_mqtt_onboard_responses.py index e45b927..999a826 100644 --- a/tests/fixtures/update_mqtt_onboard_responses.py +++ b/tests/agrirouter/fixtures/update_mqtt_onboard_responses.py @@ -1,20 +1,20 @@ import pytest from src import CapabilitiesParameters, CapabilitiesService -from src.api.environments import Qa -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.messaging.decode import decode_response -from src.api.enums import CapabilityType, CapabilityDirectionType -from src.messaging.messages import OutboxMessage -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.enums import CertificateTypes, Gateways -from src.utils.uuid_util import new_uuid -from tests.common.onboarding import onboard_communication_unit -from tests.common.sleeper import Sleeper -from tests.data.applications import CommunicationUnit -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import save_onboard_response +from src.agrirouter.api.environments import Qa +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.messaging.decode import decode_response +from src.agrirouter.api.enums import CapabilityType, CapabilityDirectionType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.enums import CertificateTypes, Gateways +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.onboarding import onboard_communication_unit +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.applications import CommunicationUnit +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import save_onboard_response class TestSingleMqttEndpointWithPEMCertificate: diff --git a/tests/internal/enviroments_test/__init__.py b/tests/agrirouter/internal/__init__.py similarity index 100% rename from tests/internal/enviroments_test/__init__.py rename to tests/agrirouter/internal/__init__.py diff --git a/tests/internal/messaging_test/__init__.py b/tests/agrirouter/internal/auth/__init__.py similarity index 100% rename from tests/internal/messaging_test/__init__.py rename to tests/agrirouter/internal/auth/__init__.py diff --git a/tests/internal/auth_test/test_auth.py b/tests/agrirouter/internal/auth/test_auth.py similarity index 90% rename from tests/internal/auth_test/test_auth.py rename to tests/agrirouter/internal/auth/test_auth.py index 7729cd3..c1258f4 100644 --- a/tests/internal/auth_test/test_auth.py +++ b/tests/agrirouter/internal/auth/test_auth.py @@ -1,9 +1,9 @@ """Tests src/auth/auth.py""" -from src.api.environments import Qa -from src.auth.auth import Authorization -from src.auth.parameters import AuthUrlParameter -from tests.common.constants import ( +from src.agrirouter.api.environments import Qa +from src.agrirouter.auth.auth import Authorization +from src.agrirouter.auth.parameters import AuthUrlParameter +from tests.agrirouter.common.constants import ( PUBLIC_KEY, PRIVATE_KEY, AUTH_RESULT_URL, diff --git a/tests/internal/auth_test/test_auth_dto.py b/tests/agrirouter/internal/auth/test_auth_dto.py similarity index 96% rename from tests/internal/auth_test/test_auth_dto.py rename to tests/agrirouter/internal/auth/test_auth_dto.py index 16bdc25..436b13e 100644 --- a/tests/internal/auth_test/test_auth_dto.py +++ b/tests/agrirouter/internal/auth/test_auth_dto.py @@ -1,8 +1,8 @@ """Tests src/auth/dto.py""" import pytest -from src.auth.dto import AuthorizationToken -from src.api.exceptions import WrongField +from src.agrirouter.auth.dto import AuthorizationToken +from src.agrirouter.api.exceptions import WrongField class TestAuthorizationToken: diff --git a/tests/internal/auth_test/test_response.py b/tests/agrirouter/internal/auth/test_response.py similarity index 90% rename from tests/internal/auth_test/test_response.py rename to tests/agrirouter/internal/auth/test_response.py index b76a45d..5e5647a 100644 --- a/tests/internal/auth_test/test_response.py +++ b/tests/agrirouter/internal/auth/test_response.py @@ -4,8 +4,8 @@ import pytest -from src.auth.response import AuthResponse -from tests.common.constants import VALID_RESPONSE_SIGNATURE, VALID_RESPONSE_TOKEN, AR_PUBLIC_KEY +from src.agrirouter.auth.response import AuthResponse +from tests.agrirouter.common.constants import VALID_RESPONSE_SIGNATURE, VALID_RESPONSE_TOKEN, AR_PUBLIC_KEY def test_decode_token(): diff --git a/tests/internal/onboarding_test/__init__.py b/tests/agrirouter/internal/environments/__init__.py similarity index 100% rename from tests/internal/onboarding_test/__init__.py rename to tests/agrirouter/internal/environments/__init__.py diff --git a/tests/internal/enviroments_test/test_environmental_services.py b/tests/agrirouter/internal/environments/test_environmental_services.py similarity index 61% rename from tests/internal/enviroments_test/test_environmental_services.py rename to tests/agrirouter/internal/environments/test_environmental_services.py index 926947b..d068186 100644 --- a/tests/internal/enviroments_test/test_environmental_services.py +++ b/tests/agrirouter/internal/environments/test_environmental_services.py @@ -1,7 +1,7 @@ """Test src/environments/environmental_services.py""" -from src.api.environments import Qa, Production -from src.environments.environmental_services import EnvironmentalService +from src.agrirouter.api.environments import Qa, Production +from src.agrirouter.environments.environmental_services import EnvironmentalService def test_arclient_set_env(): diff --git a/tests/internal/enviroments_test/test_environments.py b/tests/agrirouter/internal/environments/test_environments.py similarity index 96% rename from tests/internal/enviroments_test/test_environments.py rename to tests/agrirouter/internal/environments/test_environments.py index 302bdca..ae073e7 100644 --- a/tests/internal/enviroments_test/test_environments.py +++ b/tests/agrirouter/internal/environments/test_environments.py @@ -1,8 +1,8 @@ """Test src/environments/environments.py""" -from src.api.environments import Production -from src.api.environments import Qa -from tests.common.constants import APPLICATION_ID +from src.agrirouter.api.environments import Production +from src.agrirouter.api.environments import Qa +from tests.agrirouter.common.constants import APPLICATION_ID class TestProduction: diff --git a/tests/internal/test_revoking/__init__.py b/tests/agrirouter/internal/messaging/__init__.py similarity index 100% rename from tests/internal/test_revoking/__init__.py rename to tests/agrirouter/internal/messaging/__init__.py diff --git a/tests/internal/messaging_test/test_decode.py b/tests/agrirouter/internal/messaging/test_decode.py similarity index 93% rename from tests/internal/messaging_test/test_decode.py rename to tests/agrirouter/internal/messaging/test_decode.py index 4f8ceb4..5fdd597 100644 --- a/tests/internal/messaging_test/test_decode.py +++ b/tests/agrirouter/internal/messaging/test_decode.py @@ -1,8 +1,8 @@ import json -from src.generated.messaging.response.response_pb2 import ResponseEnvelope -from src.messaging.decode import decode_details -from src.messaging.decode import decode_response +from src.agrirouter.generated.messaging.response.response_pb2 import ResponseEnvelope +from src.agrirouter.messaging.decode import decode_details +from src.agrirouter.messaging.decode import decode_response MESSAGING_RESULT = b'[{"sensorAlternateId":"185cd97b-ed0b-4e75-a6e2-6be1cdd38a06","capabilityAlternateId":"bbe9f361-b551-48d9-9fca-1b4dc768287c","command":{"message":"XwjIARAKGiQ5NWUzNWE0Zi1jNWM4LTQ1NDEtODE4OS03NmJlMzM0OTc0NDUiJDUzNzYyM2ZjLWY2NmYtNDc5Yi1hMmJhLWVjZjNlNWM3ZjhlMCoMCNTV5YsGEICI8LIDzQIKygIKTnR5cGVzLmFncmlyb3V0ZXIuY29tL2Fncmlyb3V0ZXIucmVzcG9uc2UucGF5bG9hZC5hY2NvdW50Lkxpc3RFbmRwb2ludHNSZXNwb25zZRL3AQp4CiRkNzA0YTQ0My05OWY3LTQ3YjQtYmU1NS1lMmZhMDk2ODllYmUSJFB5dGhvblNES19kZXYgLSAyMDIxLTEwLTI1LCAxMDo1MToxOBoLYXBwbGljYXRpb24iBmFjdGl2ZTIVdXJuOm15YXBwOnNucjAwMDAzMjM0CnsKJDE4NWNkOTdiLWVkMGItNGU3NS1hNmUyLTZiZTFjZGQzOGEwNhIkUHl0aG9uU0RLX2RldiAtIDIwMjEtMTAtMjEsIDIxOjQxOjI0GgthcHBsaWNhdGlvbiIGYWN0aXZlMhh1cm46bXlhcHA6c25yMDAwMDMyMzRzZGY="}}]' # noqa diff --git a/tests/internal/messaging_test/test_encode.py b/tests/agrirouter/internal/messaging/test_encode.py similarity index 69% rename from tests/internal/messaging_test/test_encode.py rename to tests/agrirouter/internal/messaging/test_encode.py index 2cf2de4..3b1ce2d 100644 --- a/tests/internal/messaging_test/test_encode.py +++ b/tests/agrirouter/internal/messaging/test_encode.py @@ -1,9 +1,9 @@ from google.protobuf.any_pb2 import Any -from src.generated.commons.message_pb2 import Message, Messages -from src.generated.messaging.request.request_pb2 import RequestEnvelope, RequestPayloadWrapper -from src.messaging.decode import read_properties_buffers_from_input_stream -from src.messaging.encode import write_proto_parts_to_buffer +from src.agrirouter.generated.commons.message_pb2 import Message, Messages +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope, RequestPayloadWrapper +from src.agrirouter.messaging.decode import read_properties_buffers_from_input_stream +from src.agrirouter.messaging.encode import write_proto_parts_to_buffer def test_write_proto_parts_to_buffer(): diff --git a/tests/internal/messaging_test/test_request.py b/tests/agrirouter/internal/messaging/test_request.py similarity index 77% rename from tests/internal/messaging_test/test_request.py rename to tests/agrirouter/internal/messaging/test_request.py index b14cb90..dd06a8b 100644 --- a/tests/internal/messaging_test/test_request.py +++ b/tests/agrirouter/internal/messaging/test_request.py @@ -1,7 +1,7 @@ """Test src/messaging/request.py""" -from src.messaging.messages import Message -from src.messaging.request import MessageRequest +from src.agrirouter.messaging.messages import Message +from src.agrirouter.messaging.request import MessageRequest def test_json_serialize(): diff --git a/tests/service/__init__.py b/tests/agrirouter/internal/onboarding/__init__.py similarity index 100% rename from tests/service/__init__.py rename to tests/agrirouter/internal/onboarding/__init__.py diff --git a/tests/internal/onboarding_test/test_headers.py b/tests/agrirouter/internal/onboarding/test_headers.py similarity index 82% rename from tests/internal/onboarding_test/test_headers.py rename to tests/agrirouter/internal/onboarding/test_headers.py index b98abb9..2401be1 100644 --- a/tests/internal/onboarding_test/test_headers.py +++ b/tests/agrirouter/internal/onboarding/test_headers.py @@ -1,6 +1,6 @@ """Test src/onboarding/headers.py""" -from src.api.enums import ContentTypes -from src.onboarding.headers import SoftwareOnboardingHeader +from src.agrirouter.api.enums import ContentTypes +from src.agrirouter.onboarding.headers import SoftwareOnboardingHeader class TestSoftwareOnboardingHeader: diff --git a/tests/internal/onboarding_test/test_onboarding.py b/tests/agrirouter/internal/onboarding/test_onboarding.py similarity index 79% rename from tests/internal/onboarding_test/test_onboarding.py rename to tests/agrirouter/internal/onboarding/test_onboarding.py index d19d84e..dbdcaac 100644 --- a/tests/internal/onboarding_test/test_onboarding.py +++ b/tests/agrirouter/internal/onboarding/test_onboarding.py @@ -1,13 +1,13 @@ -"""Test src/onboarding/onboarding.py""" +"""Test src/onboarding/services.py""" import pytest -from src.api.environments import Qa -from src.api.exceptions import WrongCertificationType, WrongGateWayType -from src.onboarding.enums import Gateways, CertificateTypes -from src.onboarding.onboarding import SecuredOnboardingService -from src.onboarding.parameters import OnboardParameters -from tests.common.constants import PUBLIC_KEY, PRIVATE_KEY, APPLICATION_ID +from src.agrirouter.api.environments import Qa +from src.agrirouter.api.exceptions import WrongCertificationType, WrongGateWayType +from src.agrirouter.onboarding.enums import Gateways, CertificateTypes +from src.agrirouter.onboarding.services import SecuredOnboardingService +from src.agrirouter.onboarding.parameters import OnboardParameters +from tests.agrirouter.common.constants import PUBLIC_KEY, PRIVATE_KEY, APPLICATION_ID class TestSoftwareOnboarding: diff --git a/tests/internal/onboarding_test/test_onboarding_dto.py b/tests/agrirouter/internal/onboarding/test_onboarding_dto.py similarity index 98% rename from tests/internal/onboarding_test/test_onboarding_dto.py rename to tests/agrirouter/internal/onboarding/test_onboarding_dto.py index d61ee1d..1bb6d8a 100644 --- a/tests/internal/onboarding_test/test_onboarding_dto.py +++ b/tests/agrirouter/internal/onboarding/test_onboarding_dto.py @@ -1,8 +1,8 @@ """Tests src/onboarding/dto.py""" import pytest -from src.api.exceptions import WrongField -from src.onboarding.dto import ConnectionCriteria, Authentication, ErrorResponse +from src.agrirouter.api.exceptions import WrongField +from src.agrirouter.onboarding.dto import ConnectionCriteria, Authentication, ErrorResponse class TestConnectionCriteria: diff --git a/tests/internal/onboarding_test/test_request_onboarding.py b/tests/agrirouter/internal/onboarding/test_request_onboarding.py similarity index 77% rename from tests/internal/onboarding_test/test_request_onboarding.py rename to tests/agrirouter/internal/onboarding/test_request_onboarding.py index 5f08008..59587ec 100644 --- a/tests/internal/onboarding_test/test_request_onboarding.py +++ b/tests/agrirouter/internal/onboarding/test_request_onboarding.py @@ -1,9 +1,9 @@ """Test src/onboarding/request.py""" -from src.api.environments import Qa -from src.onboarding.enums import Gateways, CertificateTypes -from src.onboarding.onboarding import SecuredOnboardingService -from src.onboarding.parameters import OnboardParameters -from tests.common.constants import APPLICATION_ID, PUBLIC_KEY, PRIVATE_KEY +from src.agrirouter.api.environments import Qa +from src.agrirouter.onboarding.enums import Gateways, CertificateTypes +from src.agrirouter.onboarding.services import SecuredOnboardingService +from src.agrirouter.onboarding.parameters import OnboardParameters +from tests.agrirouter.common.constants import APPLICATION_ID, PUBLIC_KEY, PRIVATE_KEY class TestBaseOnboardingRequest: diff --git a/tests/internal/onboarding_test/test_signature.py b/tests/agrirouter/internal/onboarding/test_signature.py similarity index 79% rename from tests/internal/onboarding_test/test_signature.py rename to tests/agrirouter/internal/onboarding/test_signature.py index 2fd0bf7..e7ca805 100644 --- a/tests/internal/onboarding_test/test_signature.py +++ b/tests/agrirouter/internal/onboarding/test_signature.py @@ -3,8 +3,8 @@ import pytest from cryptography.exceptions import InvalidSignature -from src.onboarding.signature import create_signature, verify_signature -from tests.common.constants import PRIVATE_KEY, PUBLIC_KEY +from src.agrirouter.onboarding.signature import create_signature, verify_signature +from tests.agrirouter.common.constants import PRIVATE_KEY, PUBLIC_KEY def test_create_signature_ok(): diff --git a/tests/service/messaging/__init__.py b/tests/agrirouter/internal/revoking/__init__.py similarity index 100% rename from tests/service/messaging/__init__.py rename to tests/agrirouter/internal/revoking/__init__.py diff --git a/tests/internal/test_revoking/test_parameters.py b/tests/agrirouter/internal/revoking/test_parameters.py similarity index 89% rename from tests/internal/test_revoking/test_parameters.py rename to tests/agrirouter/internal/revoking/test_parameters.py index f88a8b0..b917ad2 100644 --- a/tests/internal/test_revoking/test_parameters.py +++ b/tests/agrirouter/internal/revoking/test_parameters.py @@ -1,6 +1,6 @@ """Test src/revoking/parameters.py""" -from src.revoking.parameters import RevokingParameter -from tests.common.constants import APPLICATION_ID +from src.agrirouter.revoking.parameters import RevokingParameter +from tests.agrirouter.common.constants import APPLICATION_ID class TestRevokingParameter: diff --git a/tests/internal/test_validate_toml.py b/tests/agrirouter/internal/test_validate_toml.py similarity index 66% rename from tests/internal/test_validate_toml.py rename to tests/agrirouter/internal/test_validate_toml.py index 2ef68e4..630a145 100644 --- a/tests/internal/test_validate_toml.py +++ b/tests/agrirouter/internal/test_validate_toml.py @@ -4,5 +4,5 @@ class TestTomlValidation: def test_validate_toml(self): - toml.load("../../pyproject.toml") + toml.load("../../../pyproject.toml") pass diff --git a/tests/service/messaging/mqtt/__init__.py b/tests/agrirouter/service/__init__.py similarity index 100% rename from tests/service/messaging/mqtt/__init__.py rename to tests/agrirouter/service/__init__.py diff --git a/tests/agrirouter/service/messaging/__init__.py b/tests/agrirouter/service/messaging/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/agrirouter/service/messaging/mqtt/__init__.py b/tests/agrirouter/service/messaging/mqtt/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/service/messaging/mqtt/test_capability_service.py b/tests/agrirouter/service/messaging/mqtt/test_capability_service.py similarity index 80% rename from tests/service/messaging/mqtt/test_capability_service.py rename to tests/agrirouter/service/messaging/mqtt/test_capability_service.py index 9bf4bb2..b3995f6 100644 --- a/tests/service/messaging/mqtt/test_capability_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_capability_service.py @@ -3,20 +3,20 @@ import pytest -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityDirectionType -from src.api.enums import CapabilityType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import CapabilitiesParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import CapabilitiesService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.utils.uuid_util import new_uuid -from tests.common.sleeper import Sleeper -from tests.data.applications import CommunicationUnit -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityDirectionType +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import CapabilitiesParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import CapabilitiesService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.applications import CommunicationUnit +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestMqttCapabilitiesService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_feed_confirm_service.py b/tests/agrirouter/service/messaging/mqtt/test_feed_confirm_service.py similarity index 92% rename from tests/service/messaging/mqtt/test_feed_confirm_service.py rename to tests/agrirouter/service/messaging/mqtt/test_feed_confirm_service.py index 1775703..00a830e 100644 --- a/tests/service/messaging/mqtt/test_feed_confirm_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_feed_confirm_service.py @@ -3,21 +3,21 @@ import pytest -from src.api.enums import CapabilityType -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.dto import SendMessageParameters -from src.messaging.parameters.service import FeedDeleteParameters, FeedConfirmParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, FeedDeleteService, FeedConfirmService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.dto import SendMessageParameters +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, FeedConfirmParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, FeedDeleteService, FeedConfirmService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestFeedConfirmService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_feed_delete_service.py b/tests/agrirouter/service/messaging/mqtt/test_feed_delete_service.py similarity index 94% rename from tests/service/messaging/mqtt/test_feed_delete_service.py rename to tests/agrirouter/service/messaging/mqtt/test_feed_delete_service.py index e6b124f..09a93ac 100644 --- a/tests/service/messaging/mqtt/test_feed_delete_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_feed_delete_service.py @@ -3,20 +3,20 @@ import pytest -from src.api.enums import CapabilityType -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import FeedDeleteParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.utils.utc_time_util import max_validity_period, validity_period_for_seconds -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.utils.utc_time_util import max_validity_period, validity_period_for_seconds +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestFeedDeleteService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_list_endpoints_service.py b/tests/agrirouter/service/messaging/mqtt/test_list_endpoints_service.py similarity index 92% rename from tests/service/messaging/mqtt/test_list_endpoints_service.py rename to tests/agrirouter/service/messaging/mqtt/test_list_endpoints_service.py index da46962..03c3b1c 100644 --- a/tests/service/messaging/mqtt/test_list_endpoints_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_list_endpoints_service.py @@ -3,17 +3,17 @@ import pytest -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType, CapabilityDirectionType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import ListEndpointsParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import ListEndpointsService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.utils.uuid_util import new_uuid -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType, CapabilityDirectionType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import ListEndpointsParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import ListEndpointsService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestListEndpointsService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_publish_message_service.py b/tests/agrirouter/service/messaging/mqtt/test_publish_message_service.py similarity index 87% rename from tests/service/messaging/mqtt/test_publish_message_service.py rename to tests/agrirouter/service/messaging/mqtt/test_publish_message_service.py index fb3fec4..b0b9c04 100644 --- a/tests/service/messaging/mqtt/test_publish_message_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_publish_message_service.py @@ -3,20 +3,20 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import FeedDeleteParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestSendDirectMessageService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_query_header_service.py b/tests/agrirouter/service/messaging/mqtt/test_query_header_service.py similarity index 95% rename from tests/service/messaging/mqtt/test_query_header_service.py rename to tests/agrirouter/service/messaging/mqtt/test_query_header_service.py index 12cad93..a12eb75 100644 --- a/tests/service/messaging/mqtt/test_query_header_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_query_header_service.py @@ -4,22 +4,22 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import FeedDeleteParameters, QueryHeaderParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService, \ +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, QueryHeaderParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService, \ QueryHeaderService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.utc_time_util import max_validity_period, validity_period_for_seconds -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.utc_time_util import max_validity_period, validity_period_for_seconds +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestQueryHeaderService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_query_message_service.py b/tests/agrirouter/service/messaging/mqtt/test_query_message_service.py similarity index 94% rename from tests/service/messaging/mqtt/test_query_message_service.py rename to tests/agrirouter/service/messaging/mqtt/test_query_message_service.py index 6f8ef6b..abc03d9 100644 --- a/tests/service/messaging/mqtt/test_query_message_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_query_message_service.py @@ -4,22 +4,22 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import FeedDeleteParameters, QueryMessageParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService, \ +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, QueryMessageParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService, \ QueryMessagesService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.utc_time_util import max_validity_period, validity_period_for_seconds -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.utc_time_util import max_validity_period, validity_period_for_seconds +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestQueryMessageServiceForSingleMessage(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py b/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py similarity index 90% rename from tests/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py rename to tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py index cc09c82..0da5805 100644 --- a/tests/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py +++ b/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py @@ -4,23 +4,23 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message -from src.api.enums import CapabilityType, TechnicalMessageType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.dto import ChunkedMessageParameters -from src.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters, \ +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message +from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.dto import ChunkedMessageParameters +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters, \ QueryHeaderParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService, QueryHeaderService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService, QueryHeaderService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestSendAndReceiveChunkedMessages(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py b/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py similarity index 87% rename from tests/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py rename to tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py index 469c596..d9b83d3 100644 --- a/tests/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py +++ b/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py @@ -3,22 +3,22 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message -from src.api.enums import CapabilityType, TechnicalMessageType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.dto import ChunkedMessageParameters -from src.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message +from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.dto import ChunkedMessageParameters +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestSendAndReceiveChunkedMessages(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_send_direct_message_service.py b/tests/agrirouter/service/messaging/mqtt/test_send_direct_message_service.py similarity index 87% rename from tests/service/messaging/mqtt/test_send_direct_message_service.py rename to tests/agrirouter/service/messaging/mqtt/test_send_direct_message_service.py index b396bdb..e363d19 100644 --- a/tests/service/messaging/mqtt/test_send_direct_message_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_send_direct_message_service.py @@ -3,20 +3,20 @@ import pytest -from src.generated.messaging.request.request_pb2 import RequestEnvelope -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import FeedDeleteParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.onboarding.response import OnboardResponse -from src.utils.uuid_util import new_uuid -from tests.common.data_provider import DataProvider -from tests.common.sleeper import Sleeper -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SendMessageService, SendMessageParameters, FeedDeleteService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.onboarding.response import OnboardResponse +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.data_provider import DataProvider +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestSendDirectMessageService(unittest.TestCase): diff --git a/tests/service/messaging/mqtt/test_subscription_service.py b/tests/agrirouter/service/messaging/mqtt/test_subscription_service.py similarity index 85% rename from tests/service/messaging/mqtt/test_subscription_service.py rename to tests/agrirouter/service/messaging/mqtt/test_subscription_service.py index cc9daaf..9eb6612 100644 --- a/tests/service/messaging/mqtt/test_subscription_service.py +++ b/tests/agrirouter/service/messaging/mqtt/test_subscription_service.py @@ -3,20 +3,20 @@ import pytest -from src.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification -from src.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription -from src.messaging.decode import decode_response, decode_details -from src.api.enums import CapabilityType, CapabilityDirectionType -from src.messaging.messages import OutboxMessage -from src.messaging.parameters.service import SubscriptionParameters, CapabilitiesParameters -from src.messaging.services.commons import MqttMessagingService -from src.messaging.services.messaging import SubscriptionService, CapabilitiesService -from src.messaging.services.sequence_number_service import SequenceNumberService -from src.utils.uuid_util import new_uuid -from tests.common.sleeper import Sleeper -from tests.data.applications import CommunicationUnit -from tests.data.identifier import Identifier -from tests.data.onboard_response_integration_service import read_onboard_response +from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification +from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription +from src.agrirouter.messaging.decode import decode_response, decode_details +from src.agrirouter.api.enums import CapabilityType, CapabilityDirectionType +from src.agrirouter.messaging.messages import OutboxMessage +from src.agrirouter.messaging.parameters.service import SubscriptionParameters, CapabilitiesParameters +from src.agrirouter.messaging.services.commons import MqttMessagingService +from src.agrirouter.messaging.services.messaging import SubscriptionService, CapabilitiesService +from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService +from src.agrirouter.utils.uuid_util import new_uuid +from tests.agrirouter.common.sleeper import Sleeper +from tests.agrirouter.data.applications import CommunicationUnit +from tests.agrirouter.data.identifier import Identifier +from tests.agrirouter.data.onboard_response_integration_service import read_onboard_response class TestSubscriptionService(unittest.TestCase): From e110b0e4ab4fca5aec9a71a4157e470df3c28d04 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 14:07:18 +0200 Subject: [PATCH 5/8] Refactor import statements in test_send_and_receive_chunked_messages_from_the_feed The import statements were reorganized in the file 'test_send_and_receive_chunked_messages_from_the_feed.py'. The sequence of imports was changed and multi-line import statements were aligned for better readability and code formatting standards. --- .../test_send_and_receive_chunked_messages_from_the_feed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py b/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py index 0da5805..51deecf 100644 --- a/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py +++ b/tests/agrirouter/service/messaging/mqtt/test_send_and_receive_chunked_messages_from_the_feed.py @@ -4,14 +4,14 @@ import pytest +from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope from src.agrirouter.messaging.decode import decode_response, decode_details from src.agrirouter.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message -from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType from src.agrirouter.messaging.messages import OutboxMessage from src.agrirouter.messaging.parameters.dto import ChunkedMessageParameters -from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters, \ - QueryHeaderParameters +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, \ + MessagePayloadParameters, QueryHeaderParameters from src.agrirouter.messaging.services.commons import MqttMessagingService from src.agrirouter.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService, QueryHeaderService from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService From 2853f597f3a7b90dff64d265f0a9b2487bccafae Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 14:08:06 +0200 Subject: [PATCH 6/8] typeReorder imports in mqtt tests The imports in the mqtt test script have been restructured for better readability and maintenance. The imports related to 'enums', 'parameters.service' and 'request.request_pb2' have been modified. It does not affect the functionality of the test cases or the script, but enhances the structure. --- ...d_chunked_messages_and_receive_with_push_notifications.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py b/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py index d9b83d3..73bcd6a 100644 --- a/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py +++ b/tests/agrirouter/service/messaging/mqtt/test_send_chunked_messages_and_receive_with_push_notifications.py @@ -3,13 +3,14 @@ import pytest +from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope from src.agrirouter.messaging.decode import decode_response, decode_details from src.agrirouter.messaging.encode import chunk_and_base64encode_each_chunk, encode_chunks_message -from src.agrirouter.api.enums import CapabilityType, TechnicalMessageType from src.agrirouter.messaging.messages import OutboxMessage from src.agrirouter.messaging.parameters.dto import ChunkedMessageParameters -from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, MessagePayloadParameters +from src.agrirouter.messaging.parameters.service import FeedDeleteParameters, MessageHeaderParameters, \ + MessagePayloadParameters from src.agrirouter.messaging.services.commons import MqttMessagingService from src.agrirouter.messaging.services.messaging import FeedDeleteService, SendChunkedMessageService from src.agrirouter.messaging.services.sequence_number_service import SequenceNumberService From d9af01852353d578becd1ea905f1719493fd8e99 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 14:08:17 +0200 Subject: [PATCH 7/8] Update imports in type_url.py The import order and placement in type_url.py has been corrected to improve code readability and organization. Along with this, import statements for TimeLog and ISO11783_TaskData from efdi_pb2 and TypeUrlNotFound from exceptions have been moved to the top. --- src/agrirouter/utils/type_url.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/agrirouter/utils/type_url.py b/src/agrirouter/utils/type_url.py index 688987e..eba4195 100644 --- a/src/agrirouter/utils/type_url.py +++ b/src/agrirouter/utils/type_url.py @@ -1,7 +1,10 @@ -from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingResponse, \ +from src.agrirouter.api.exceptions import TypeUrlNotFound +from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import \ + OnboardingResponse, \ OnboardingRequest from src.agrirouter.generated.commons.message_pb2 import Messages from src.agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery +from src.agrirouter.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData from src.agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification from src.agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription from src.agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageDelete, MessageConfirm, \ @@ -9,11 +12,7 @@ from src.agrirouter.generated.messaging.response.payload.account.endpoints_pb2 import ListEndpointsResponse from src.agrirouter.generated.messaging.response.payload.feed.feed_response_pb2 import HeaderQueryResponse, \ MessageQueryResponse - -from src.agrirouter.generated.messaging.request.payload.efdi.efdi_pb2 import TimeLog, ISO11783_TaskData - from src.agrirouter.generated.messaging.response.payload.feed.push_notification_pb2 import PushNotification -from src.agrirouter.api.exceptions import TypeUrlNotFound class TypeUrl: From 75e4071c922892e7cba8805bf86896aa2eb686a5 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 11 Apr 2024 14:08:38 +0200 Subject: [PATCH 8/8] Update import order in cloud.py Adjusted the import order in cloud.py to improve readability and code consistency. `TechnicalMessageType` has been moved to precede the import from `cloud_virtualized_app_registration_pb2`. No functional changes have been made. --- src/agrirouter/messaging/services/cloud.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/agrirouter/messaging/services/cloud.py b/src/agrirouter/messaging/services/cloud.py index 946404d..3d4c355 100644 --- a/src/agrirouter/messaging/services/cloud.py +++ b/src/agrirouter/messaging/services/cloud.py @@ -1,8 +1,9 @@ -from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import OnboardingRequest, \ +from src.agrirouter.api.enums import TechnicalMessageType +from src.agrirouter.generated.cloud_provider_integration.cloud_virtualized_app_registration_pb2 import \ + OnboardingRequest, \ OffboardingRequest from src.agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope from src.agrirouter.messaging.encode import encode_message -from src.agrirouter.api.enums import TechnicalMessageType from src.agrirouter.messaging.messages import EncodedMessage from src.agrirouter.messaging.parameters.service import MessageHeaderParameters, MessagePayloadParameters, \ CloudOnboardParameters, CloudOffboardParameters