adress pr feedback

Author: Datata1

src/codesphere/core/base.py

@@ -1,12 +1,13 @@
 from typing import Any, Generic, List, TypeVar
 
+import yaml
 from pydantic import BaseModel, ConfigDict, RootModel
 from pydantic.alias_generators import to_camel
 
 from ..http_client import APIHttpClient
 from .handler import _APIOperationExecutor
 
-ModelT = TypeVar("ModelT")
+ModelT = TypeVar("ModelT", bound=BaseModel)
 
 
 class ResourceBase(_APIOperationExecutor):
@@ -59,25 +60,13 @@ def to_json(
     def to_yaml(self, *, by_alias: bool = True, exclude_none: bool = False) -> str:
         """Export model as a YAML string.
 
-        Requires PyYAML to be installed (optional dependency).
-
         Args:
             by_alias: Use camelCase keys (API format) if True, snake_case if False.
             exclude_none: Exclude fields with None values if True.
 
         Returns:
             YAML string representation of the model.
-
-        Raises:
-            ImportError: If PyYAML is not installed.
         """
-        try:
-            import yaml
-        except ImportError:
-            raise ImportError(
-                "PyYAML is required for YAML export. "
-                "Install it with: pip install pyyaml"
-            )
         data = self.to_dict(by_alias=by_alias, exclude_none=exclude_none)
         return yaml.dump(
             data, default_flow_style=False, allow_unicode=True, sort_keys=False
@@ -110,8 +99,6 @@ def to_list(
         """
         return [
             item.model_dump(by_alias=by_alias, exclude_none=exclude_none)
-            if hasattr(item, "model_dump")
-            else item
             for item in self.root
         ]
 
@@ -141,25 +128,13 @@ def to_json(
     def to_yaml(self, *, by_alias: bool = True, exclude_none: bool = False) -> str:
         """Export all items as a YAML string.
 
-        Requires PyYAML to be installed (optional dependency).
-
         Args:
             by_alias: Use camelCase keys (API format) if True, snake_case if False.
             exclude_none: Exclude fields with None values if True.
 
         Returns:
             YAML string representation.
-
-        Raises:
-            ImportError: If PyYAML is not installed.
         """
-        try:
-            import yaml
-        except ImportError:
-            raise ImportError(
-                "PyYAML is required for YAML export. "
-                "Install it with: pip install pyyaml"
-            )
         return yaml.dump(
             self.to_list(by_alias=by_alias, exclude_none=exclude_none),
             default_flow_style=False,

tests/core/test_base.py

@@ -1,3 +1,4 @@
+import json
 from dataclasses import dataclass
 from unittest.mock import MagicMock
 
@@ -140,7 +141,7 @@ class SampleModel(CamelModel):
         model = SampleModel(team_id=42)
         result = model.to_json()
 
-        assert result == '{"teamId":42}'
+        assert json.loads(result) == {"teamId": 42}
 
     def test_to_json_with_indent(self):
         """to_json with indent should format output."""
@@ -151,22 +152,34 @@ class SampleModel(CamelModel):
         model = SampleModel(team_id=42)
         result = model.to_json(indent=2)
 
-        assert '"teamId": 42' in result
+        assert json.loads(result) == {"teamId": 42}
         assert "\n" in result
 
-    def test_to_yaml_import_error(self):
-        """to_yaml should raise ImportError if PyYAML is not installed."""
-        import sys
-        from unittest.mock import patch
+    def test_to_yaml_default(self):
+        """to_yaml should export as YAML string with camelCase keys."""
+
+        class SampleModel(CamelModel):
+            team_id: int
+            user_name: str
+
+        model = SampleModel(team_id=1, user_name="test")
+        result = model.to_yaml()
+
+        assert "teamId: 1" in result
+        assert "userName: test" in result
+
+    def test_to_yaml_snake_case(self):
+        """to_yaml with by_alias=False should use snake_case keys."""
 
         class SampleModel(CamelModel):
             team_id: int
 
         model = SampleModel(team_id=1)
+        result = model.to_yaml(by_alias=False)
+
+        assert "team_id: 1" in result
+
 
-        with patch.dict(sys.modules, {"yaml": None}):
-            with pytest.raises(ImportError, match="PyYAML is required"):
-                model.to_yaml()
 class TestResourceList:
     def test_create_with_list(self):
         """ResourceList should be created with a list of items."""
@@ -267,7 +280,7 @@ class Item(CamelModel):
         resource_list = ResourceList[Item](root=items)
         result = resource_list.to_json()
 
-        assert result == '[{"itemId": 1}, {"itemId": 2}]'
+        assert json.loads(result) == [{"itemId": 1}, {"itemId": 2}]
 
     def test_to_json_with_indent(self):
         """to_json with indent should format output."""
@@ -293,6 +306,19 @@ class Item(CamelModel):
 
         assert result == []
 
+    def test_to_yaml_default(self):
+        """to_yaml should export as YAML string."""
+
+        class Item(CamelModel):
+            item_id: int
+
+        items = [Item(item_id=1), Item(item_id=2)]
+        resource_list = ResourceList[Item](root=items)
+        result = resource_list.to_yaml()
+
+        assert "itemId: 1" in result
+        assert "itemId: 2" in result
+
 
 class TestResourceBase:
     def test_initialization_with_http_client(self):