From 67d731f0701246e4a2a4c77e3fb6dfa4ec4c98a1 Mon Sep 17 00:00:00 2001
From: pankit-eng <thapar.pankit@gmail.com>
Date: Tue, 7 Oct 2025 18:07:19 -0400
Subject: [PATCH] move core env server code into env_server dir from env dir

---
 src/core/{env => env_server}/__init__.py      | 37 ++++++++++++-------
 .../{env => env_server}/base_transforms.py    |  0
 .../code_execution_environment.py             |  0
 src/core/{env => env_server}/interfaces.py    | 34 +----------------
 src/core/{env => env_server}/types.py         |  0
 5 files changed, 24 insertions(+), 47 deletions(-)
 rename src/core/{env => env_server}/__init__.py (55%)
 rename src/core/{env => env_server}/base_transforms.py (100%)
 rename src/core/{env => env_server}/code_execution_environment.py (100%)
 rename src/core/{env => env_server}/interfaces.py (66%)
 rename src/core/{env => env_server}/types.py (100%)

diff --git a/src/core/env/__init__.py b/src/core/env_server/__init__.py
similarity index 55%
rename from src/core/env/__init__.py
rename to src/core/env_server/__init__.py
index b0bd5b9d4..51518f0d5 100644
--- a/src/core/env/__init__.py
+++ b/src/core/env_server/__init__.py
@@ -6,25 +6,34 @@
 
 """Core environment interfaces and types."""
 
-from .interfaces import Environment, Transform, Tool, ToolRegistry
-from .types import (
-    Action, CodeAction, Observation, CodeObservation,
-    State, CodeState, ExecutionResult
-)
 from .base_transforms import CompositeTransform, NullTransform
 from .code_execution_environment import CodeExecutionEnvironment
+from .interfaces import Environment, Transform
+from .types import (
+    Action,
+    CodeAction,
+    CodeObservation,
+    CodeState,
+    ExecutionResult,
+    Observation,
+    State,
+)
 
 __all__ = [
     # Core interfaces
-    "Environment", "Transform", "Tool", "ToolRegistry",
-
+    "Environment",
+    "Transform",
     # Types
-    "Action", "CodeAction", "Observation", "CodeObservation",
-    "State", "CodeState", "ExecutionResult",
-
+    "Action",
+    "CodeAction",
+    "Observation",
+    "CodeObservation",
+    "State",
+    "CodeState",
+    "ExecutionResult",
     # Base transforms
-    "CompositeTransform", "NullTransform",
-
+    "CompositeTransform",
+    "NullTransform",
     # Base environment implementation
-    "CodeExecutionEnvironment"
-]
\ No newline at end of file
+    "CodeExecutionEnvironment",
+]
diff --git a/src/core/env/base_transforms.py b/src/core/env_server/base_transforms.py
similarity index 100%
rename from src/core/env/base_transforms.py
rename to src/core/env_server/base_transforms.py
diff --git a/src/core/env/code_execution_environment.py b/src/core/env_server/code_execution_environment.py
similarity index 100%
rename from src/core/env/code_execution_environment.py
rename to src/core/env_server/code_execution_environment.py
diff --git a/src/core/env/interfaces.py b/src/core/env_server/interfaces.py
similarity index 66%
rename from src/core/env/interfaces.py
rename to src/core/env_server/interfaces.py
index 0a6183616..86241bf62 100644
--- a/src/core/env/interfaces.py
+++ b/src/core/env_server/interfaces.py
@@ -32,7 +32,7 @@ def __call__(self, observation: Observation) -> Observation:
 
 
 class Environment(ABC):
-    """Base class for all environments following Gym/Gymnasium API.
+    """Base class for all environment servers following Gym/Gymnasium API.
 
     Args:
         transform: Optional transform to apply to observations
@@ -62,35 +62,3 @@ def _apply_transform(self, observation: Observation) -> Observation:
         if self.transform is not None:
             return self.transform(observation)
         return observation
-
-
-class Tool(ABC):
-    """Base class for tools that can be used in code execution."""
-
-    @abstractmethod
-    def __call__(self, *args, **kwargs) -> Any:
-        """Execute the tool."""
-        pass
-
-
-class ToolRegistry:
-    """Registry for managing tools available to code execution."""
-
-    def __init__(self):
-        self._tools: dict[str, Any] = {}
-
-    def register(self, name: str, tool: Any):
-        """Register a tool with a name."""
-        self._tools[name] = tool
-
-    def get(self, name: str) -> Any | None:
-        """Get a tool by name."""
-        return self._tools.get(name)
-
-    def get_all(self) -> dict[str, Any]:
-        """Get all registered tools."""
-        return self._tools.copy()
-
-    def get_names(self) -> list[str]:
-        """Get all tool names."""
-        return list(self._tools.keys())
diff --git a/src/core/env/types.py b/src/core/env_server/types.py
similarity index 100%
rename from src/core/env/types.py
rename to src/core/env_server/types.py