Merge tracing CI fixes into deploy/agent

Author: lyzno1

api/controllers/console/agent/tracing.py

@@ -38,6 +38,7 @@
 from services.app.agent_app_contracts import AgentAppNotFoundError
 from services.app.console_service import ConsoleAppNotFoundError
 from services.app_tracing_config_service import (
+    AppTraceSettings,
     AppTracingConfigAlreadyExistsError,
     AppTracingConfigAppNotFoundError,
     AppTracingConfigConflictError,
@@ -48,7 +49,6 @@
     AppTracingConfigProviderUnavailableError,
     AppTracingConfigVerificationFailedError,
 )
-from services.entities.app_entities import AppTraceSettings
 
 _EDIT_ROLES = frozenset({TenantAccountRole.OWNER, TenantAccountRole.ADMIN, TenantAccountRole.EDITOR})
 

api/controllers/console/app/app.py

@@ -72,6 +72,7 @@
     InvalidAppExportError,
 )
 from services.app_tracing_config_service import (
+    AppTraceSettings,
     AppTracingConfigAppNotFoundError,
     AppTracingConfigConflictError,
     AppTracingConfigInvalidConfigurationError,
@@ -85,7 +86,6 @@
     AppListParams,
     AppListSortBy,
     AppRecord,
-    AppTraceSettings,
     CopyAppParams,
     CreateAppParams,
     StarredAppListParams,

api/repositories/app/console_repository.py

@@ -49,6 +49,7 @@
 from services.app.console_service import ConsoleAppNotFoundError, ConsoleApps
 from services.app.query_service import AppDescription, DiscoveryApps, RelatedApps
 from services.app_creation_records import create_installed_app_record, create_site_record
+from services.app_tracing_config_service import AppTraceSettings
 from services.entities.app_entities import (
     RECENT_APP_MODES,
     AppAgentBinding,
@@ -64,7 +65,6 @@
     AppRecord,
     AppReference,
     AppSummary,
-    AppTraceSettings,
     AppUpdateArguments,
     CreateAppParams,
     RecentAppListItem,

api/repositories/app/tracing_config_repository.py

@@ -12,13 +12,13 @@
 from models.model import App, TraceAppConfig
 from repositories.app.console_visibility import console_visible_condition
 from services.app_tracing_config_service import (
+    AppTraceSettings,
     AppTracingConfigAppNotFoundError,
     AppTracingConfigConflictError,
     AppTracingConfigNotFoundError,
     AppTracingConfigRecord,
     AppTracingConfigStore,
 )
-from services.entities.app_entities import AppTraceSettings
 
 _trace_settings = TypeAdapter(AppTraceSettings)
 

api/services/agent_tracing_config_service.py

@@ -7,8 +7,7 @@
 from typing import Any, Protocol
 
 from machinery.context import RequestContext
-from services.app_tracing_config_service import AppTracingConfigRecord, AppTracingConfigService
-from services.entities.app_entities import AppTraceSettings
+from services.app_tracing_config_service import AppTraceSettings, AppTracingConfigRecord, AppTracingConfigService
 
 
 class AgentTracingOwner(Protocol):

api/services/app/console_service.py

@@ -11,6 +11,7 @@
 from models.model import AppMode
 from services.agent.errors import InvalidRosterAgentPackageError
 from services.agent.roster_package_entities import RosterAgentPackageExport
+from services.app_tracing_config_service import AppTraceSettings
 from services.entities.app_entities import (
     AppChange,
     AppCreationSettings,
@@ -21,7 +22,6 @@
     AppPage,
     AppRecord,
     AppReference,
-    AppTraceSettings,
     CopyAppParams,
     CreateAppParams,
     ImportedAppPackage,

api/services/app_tracing_config_service.py

@@ -5,7 +5,14 @@
 from typing import Any, Protocol
 
 from machinery.context import RequestContext
-from services.entities.app_entities import AppTraceSettings
+
+
+@dataclass(frozen=True, slots=True)
+class AppTraceSettings:
+    enabled: bool = False
+    tracing_provider: str | None = None
+    capture_content: bool = False
+    capture_agent: bool = True
 
 
 @dataclass(frozen=True, slots=True)

api/services/entities/app_entities.py

@@ -225,14 +225,6 @@ class AppReference:
     bound_agent_id: str | None
 
 
-@dataclass(frozen=True, slots=True)
-class AppTraceSettings:
-    enabled: bool = False
-    tracing_provider: str | None = None
-    capture_content: bool = False
-    capture_agent: bool = True
-
-
 @dataclass(frozen=True, slots=True)
 class AppCreationSettings:
     app: dict[str, Any]

api/tests/unit_tests/controllers/console/agent/test_tracing.py

@@ -19,8 +19,7 @@
 from machinery.context import RequestContext
 from models.account import Account, AccountStatus, TenantAccountRole
 from services.app.agent_app_contracts import AgentAppNotFoundError
-from services.app_tracing_config_service import AppTracingConfigRecord
-from services.entities.app_entities import AppTraceSettings
+from services.app_tracing_config_service import AppTraceSettings, AppTracingConfigRecord
 from tests.unit_tests.config_override import apply_config_overrides
 
 AGENT_ID = UUID("1fbc2f02-f7e0-4910-9032-cbe5bf6c65d5")

api/tests/unit_tests/controllers/console/app/test_console_app_api.py

@@ -27,12 +27,12 @@
     CreatorsPlatformDisabledError,
     InvalidAppExportError,
 )
+from services.app_tracing_config_service import AppTraceSettings
 from services.entities.app_entities import (
     AppExportOptions,
     AppListParams,
     AppPage,
     AppRecord,
-    AppTraceSettings,
     CopyAppParams,
     CreateAppParams,
     StarredAppListParams,