Move mediaconfig to prevent circular dependencies

equinor · Dec 9, 2024 · cc5f0cc · cc5f0cc
1 parent ca0b795
commit cc5f0cc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/src/isar/apis/models/media_connection_type.py b/src/isar/apis/models/media_connection_type.py
diff --git a/src/isar/apis/models/models.py b/src/isar/apis/models/models.py
@@ -1,8 +1,6 @@
-from dataclasses import dataclass
 from typing import List, Optional
 
 from alitra import Frame, Orientation, Pose, Position
-from isar.apis.models.media_connection_type import MediaConnectionType
 from pydantic import BaseModel, Field
 
 from robot_interface.models.mission.task import TaskTypes
@@ -35,13 +33,6 @@ class RobotInfoResponse(BaseModel):
     plant_short_name: str
 
 
-@dataclass
-class MediaConfig:
-    url: str
-    token: str
-    media_connection_type: MediaConnectionType
-
-
 class InputOrientation(BaseModel):
     x: float
     y: float

diff --git a/src/isar/services/utilities/robot_utilities.py b/src/isar/services/utilities/robot_utilities.py
@@ -2,7 +2,7 @@
 
 from injector import inject
 
-from isar.apis.models.models import MediaConfig
+from robot_interface.models.robots.media import MediaConfig
 from robot_interface.robot_interface import RobotInterface
 
 

diff --git a/src/robot_interface/models/robots/media.py b/src/robot_interface/models/robots/media.py
@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+from enum import Enum
+
+
+class MediaConnectionType(str, Enum):
+    LiveKit: str = "LiveKit"
+
+
+@dataclass
+class MediaConfig:
+    url: str
+    token: str
+    media_connection_type: MediaConnectionType
diff --git a/src/robot_interface/robot_interface.py b/src/robot_interface/robot_interface.py
@@ -3,7 +3,7 @@
 from threading import Thread
 from typing import Callable, List
 
-from isar.apis.models.models import MediaConfig
+from robot_interface.models.robots.media import MediaConfig
 from robot_interface.models.initialize import InitializeParams
 from robot_interface.models.inspection.inspection import Inspection
 from robot_interface.models.mission.mission import Mission

diff --git a/tests/mocks/robot_interface.py b/tests/mocks/robot_interface.py
@@ -6,8 +6,8 @@
 
 from alitra import Frame, Orientation, Pose, Position
 
-from isar.apis.models.media_connection_type import MediaConnectionType
-from isar.apis.models.models import MediaConfig
+from robot_interface.models.robots.media import MediaConnectionType
+from robot_interface.models.robots.media import MediaConfig
 from robot_interface.models.initialize import InitializeParams
 from robot_interface.models.inspection.inspection import (
     Image,
@@ -22,7 +22,6 @@
 
 
 class MockRobot(RobotInterface):
-
     def __init__(
         self,
         mission_status: MissionStatus = MissionStatus.Successful,