Refactor messaging services and minor changes in file structures

Made several changes in messaging services including restructuring and moving certain classes to align with design patterns. Also made minor changes and updates in file structures of various test scripts and source files. Improved unified decoding strategy with EncodingService class.

example_script.py

@@ -1,21 +1,21 @@
 import time
 import agrirouter as ar
 from agrirouter.api.enums import CapabilityType
+from agrirouter.service.dto.response.messaging import OnboardResponse
+from agrirouter.service.messaging.common import MqttMessagingService, HttpMessagingService
+from agrirouter.service.messaging.message_sending import ListEndpointsService, CapabilitiesService, SubscriptionService, \
+    QueryHeaderService
 from agrirouter.service.parameter.messaging import QueryHeaderParameters, ListEndpointsParameters, \
     CapabilitiesParameters, SubscriptionParameters
-from agrirouter.service.messaging import QueryHeaderService, ListEndpointsService, CapabilitiesService, \
-    SubscriptionService
 from agrirouter.api.enums import Gateways
 from agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription
 from agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification
-from agrirouter.service.messaging import HttpMessagingService, MqttMessagingService
 from agrirouter.util.uuid_util import UUIDUtil
 
 from google.protobuf.timestamp_pb2 import Timestamp
 
 from agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery
 from agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod
-from agrirouter.service.onboarding import OnboardResponse
 
 public_key = """-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGt41/+kSOTlO1sJvLIN

src/agrirouter/service/certification.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from agrirouter.service.dto.response.onboarding import OnboardResponse
+from agrirouter.service.dto.response.messaging import OnboardResponse
 
 
 class CertificationService:

src/agrirouter/service/client/http.py

@@ -5,7 +5,7 @@
 from urllib.parse import urlparse
 
 from agrirouter.service.certification import CertificationService
-from agrirouter.service.dto.response.onboarding import OnboardResponse
+from agrirouter.service.dto.response.messaging import OnboardResponse
 
 
 class HttpClient:

src/agrirouter/service/messaging/cloud.py

@@ -62,7 +62,7 @@ def encode(parameters: CloudOffboardParameters) -> EncodedMessage:
             value=offboarding_request.SerializeToString()
         )
 
-        message_content = encode_message(message_header_parameters, message_payload_parameters)
+        message_content = EncodingService.encode_message(message_header_parameters, message_payload_parameters)
         encoded_message = EncodedMessage(
             id_=UUIDUtil.new_uuid(),
             content=message_content

src/agrirouter/service/messaging/encoding.py

@@ -8,7 +8,7 @@
 from agrirouter.api.messages import MessageParameterTuple
 from agrirouter.generated.commons.chunk_pb2 import ChunkComponent
 from agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope, RequestPayloadWrapper
-from agrirouter.service.dto.response.onboarding import OnboardResponse
+from agrirouter.service.dto.response.messaging import OnboardResponse
 from agrirouter.service.messaging.sequence_numbers import SequenceNumberService
 from agrirouter.service.parameter.messaging import MessageHeaderParameters, MessagePayloadParameters
 from agrirouter.util.utc_time_util import UtcTimeUtil

src/agrirouter/service/messaging/message_sending.py

@@ -9,13 +9,12 @@
 from agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageConfirm, MessageDelete, \
     MessageQuery
 from agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope
-from agrirouter.service.dto.messaging import SendMessageParameters, ChunkedMessageParameters
 from agrirouter.service.messaging.common import AbstractService
 from agrirouter.service.messaging.encoding import EncodingService
 from agrirouter.service.parameter.messaging import MessageHeaderParameters, MessagePayloadParameters, \
     CapabilitiesParameters, FeedConfirmParameters, FeedDeleteParameters, ListEndpointsParameters, \
     SubscriptionParameters, QueryHeaderParameters, QueryMessageParameters, ImageParameters, TaskParameters, \
-    EfdiParameters
+    EfdiParameters, SendMessageParameters, ChunkedMessageParameters
 from agrirouter.util.type_url import TypeUrl
 from agrirouter.util.uuid_util import UUIDUtil
 

src/agrirouter/service/onboarding.py

@@ -1,11 +1,10 @@
 import requests
-from agrirouter.service.onboarding.request_headers import SoftwareOnboardingHeader
 
 from agrirouter.api.env import BaseEnvironment
 from agrirouter.api.env import EnvironmentalService
 from agrirouter.api.exceptions import UnexpectedErrorDuringOnboarding, RequestNotSigned
-from agrirouter.service.dto.request.onboarding import OnboardRequest, SoftwareOnboardingBody
-from agrirouter.service.dto.response.onboarding import VerificationResponse, OnboardResponse
+from agrirouter.service.dto.request.onboarding import OnboardRequest, SoftwareOnboardingBody, SoftwareOnboardingHeader
+from agrirouter.service.dto.response.messaging import VerificationResponse, OnboardResponse
 from agrirouter.service.parameter.onboarding import OnboardParameters
 
 

src/agrirouter/service/parameter/messaging.py

@@ -1,13 +1,13 @@
 from copy import deepcopy
 from typing import List
 
+from agrirouter.api.messages import EncodedMessage
 from agrirouter.generated.commons.chunk_pb2 import ChunkComponent
 from agrirouter.generated.commons.message_pb2 import Metadata
 from agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification
 from agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription
 from agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import ValidityPeriod
-from agrirouter.service.dto.messaging import MessageParameters
-from agrirouter.service.dto.response.onboarding import BaseOnboardingResponse
+from agrirouter.service.dto.response.messaging import BaseOnboardingResponse
 
 
 class Parameters:

tests/agrirouter/common/onboarding.py

@@ -1,5 +1,5 @@
+from agrirouter.service.dto.response.messaging import OnboardResponse
 from agrirouter.service.onboarding import OnboardParameters
-from agrirouter.service.onboarding import OnboardResponse
 from agrirouter.service.onboarding import OnboardingService
 from tests.agrirouter.data.applications import CommunicationUnit
 

tests/agrirouter/data/onboard_response_integration_service.py

@@ -2,7 +2,7 @@
 import os
 
 import tests
-from agrirouter.service.onboarding import OnboardResponse
+from agrirouter.service.dto.response.messaging import OnboardResponse
 
 
 def read_onboard_response(identifier: str) -> OnboardResponse:

tests/agrirouter/fixtures/update_http_onboard_responses.py

@@ -7,9 +7,9 @@
 from agrirouter.api.enums import CertificateTypes, Gateways
 from agrirouter.api.env import Qa
 from agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification
-from agrirouter.service.messaging import CapabilitiesService
-from agrirouter.service.messaging import HttpMessagingService
-from agrirouter.service.messaging.http import FetchMessageService
+from agrirouter.service.messaging.common import HttpMessagingService
+from agrirouter.service.messaging.http.message_fetching import FetchMessageService
+from agrirouter.service.messaging.message_sending import CapabilitiesService
 from agrirouter.service.onboarding import OnboardResponse
 from agrirouter.service.parameter.messaging import CapabilitiesParameters
 from agrirouter.util.uuid_util import UUIDUtil

tests/agrirouter/fixtures/update_mqtt_onboard_responses.py

@@ -5,9 +5,9 @@
 from agrirouter.api.env import Qa
 from agrirouter.api.messages import OutboxMessage
 from agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification
-from agrirouter.service.messaging import CapabilitiesService
-from agrirouter.service.messaging import MqttMessagingService
+from agrirouter.service.messaging.common import MqttMessagingService
 from agrirouter.service.messaging.decoding import DecodingService
+from agrirouter.service.messaging.message_sending import CapabilitiesService
 from agrirouter.service.messaging.sequence_numbers import SequenceNumberService
 from agrirouter.service.parameter.messaging import CapabilitiesParameters
 from agrirouter.util.uuid_util import UUIDUtil

tests/agrirouter/internal/environments/test_environmental_services.py

@@ -1,8 +1,6 @@
 """Test src/env/environmental_services.py"""
 
-from src.agrirouter.env.environmental_services import EnvironmentalService
-
-from src.agrirouter.api.env import Qa, Production
+from src.agrirouter.api.env import Qa, Production, EnvironmentalService
 
 
 def test_arclient_set_env():

tests/agrirouter/internal/messaging/test_decode.py

@@ -31,7 +31,7 @@ def test_decode_details():
     json_response = json.loads(MESSAGING_RESULT)
     message = DecodingService.decode_response(json_response[0]["command"]["message"].encode())
     details = message.response_payload.details
-    decoded_details = decode_details(details)
+    decoded_details = DecodingService.decode_details(details)
 
     assert decoded_details.endpoints
     assert len(decoded_details.endpoints) == 2

tests/agrirouter/internal/onboarding/test_onboarding_dto.py

@@ -2,7 +2,7 @@
 import pytest
 
 from agrirouter.api.exceptions import WrongField
-from agrirouter.service.onboarding import ConnectionCriteria, Authentication, ErrorResponse
+from agrirouter.service.dto.response.onboarding import Authentication, ConnectionCriteria, ErrorResponse
 
 
 class TestConnectionCriteria: