diff --git a/monitoring/mock_uss/interaction_logging/logger.py b/monitoring/mock_uss/interaction_logging/logger.py index 78f090541f..a4112ae311 100644 --- a/monitoring/mock_uss/interaction_logging/logger.py +++ b/monitoring/mock_uss/interaction_logging/logger.py @@ -3,11 +3,10 @@ import flask import json -from loguru import logger from monitoring.mock_uss import webapp, require_config_value from monitoring.mock_uss.interaction_logging.config import KEY_INTERACTIONS_LOG_DIR -from monitoring.mock_uss.interaction_logging.interactions import ( +from monitoring.monitorlib.clients.mock_uss.interactions import ( Interaction, QueryDirection, ) diff --git a/monitoring/mock_uss/interaction_logging/routes_interactions_log.py b/monitoring/mock_uss/interaction_logging/routes_interactions_log.py index 739858fa50..e4e1a2d1d3 100644 --- a/monitoring/mock_uss/interaction_logging/routes_interactions_log.py +++ b/monitoring/mock_uss/interaction_logging/routes_interactions_log.py @@ -10,7 +10,7 @@ from monitoring.monitorlib.scd_automated_testing.scd_injection_api import ( SCOPE_SCD_QUALIFIER_INJECT, ) -from monitoring.mock_uss.interaction_logging.interactions import ( +from monitoring.monitorlib.clients.mock_uss.interactions import ( Interaction, ListLogsResponse, ) diff --git a/monitoring/mock_uss/interaction_logging/interactions.py b/monitoring/monitorlib/clients/mock_uss/interactions.py similarity index 100% rename from monitoring/mock_uss/interaction_logging/interactions.py rename to monitoring/monitorlib/clients/mock_uss/interactions.py diff --git a/monitoring/uss_qualifier/reports/report.py b/monitoring/uss_qualifier/reports/report.py index eb8da639d3..3f3eebbe41 100644 --- a/monitoring/uss_qualifier/reports/report.py +++ b/monitoring/uss_qualifier/reports/report.py @@ -22,8 +22,6 @@ from monitoring.uss_qualifier.scenarios.definitions import TestScenarioTypeName from monitoring.uss_qualifier.suites.definitions import TestSuiteActionDeclaration -from monitoring.mock_uss.interaction_logging.interactions import Interaction - class FailedCheck(ImplicitDict): name: str diff --git a/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py b/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py index 53c7a104e7..02c9be1a3b 100644 --- a/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py +++ b/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py @@ -1,4 +1,4 @@ -from typing import Tuple, Optional, List +from typing import Optional from loguru import logger from implicitdict import ImplicitDict @@ -8,7 +8,7 @@ GetLocalityResponse, PutLocalityRequest, ) -from monitoring.monitorlib.fetch import QueryError, Query +from monitoring.monitorlib.fetch import QueryError from monitoring.monitorlib.infrastructure import AuthAdapter, UTMClientSession from monitoring.monitorlib.locality import LocalityCode from monitoring.monitorlib.scd_automated_testing.scd_injection_api import ( @@ -17,7 +17,7 @@ from monitoring.uss_qualifier.reports.report import ParticipantID from monitoring.uss_qualifier.resources.communications import AuthAdapterResource from monitoring.uss_qualifier.resources.resource import Resource -from monitoring.mock_uss.interaction_logging.interactions import ( +from monitoring.monitorlib.clients.mock_uss.interactions import ( Interaction, ListLogsResponse, )