WIP trying tests out

Author: ParthSareen

ollama/_types.py

@@ -4,6 +4,7 @@
 from datetime import datetime
 from typing import (
   Any,
+  List,
   Literal,
   Mapping,
   Optional,
@@ -229,13 +230,13 @@ class Function(SubscriptableBaseModel):
     description: str
 
     class Parameters(SubscriptableBaseModel):
-      type: Union[str, list[str]]
+      type: Union[str, List[str]]
       required: Optional[Sequence[str]] = None
       properties: Optional[JsonSchemaValue] = None
 
     parameters: Parameters
 
-    return_type: Optional[str | list[str]] = None
+    return_type: Optional[Union[str, List[str]]] = None
 
   function: Function
 

tests/test_utils.py

@@ -1,3 +1,11 @@
+import sys
+
+import pytest
+
+if sys.version_info < (3, 10):
+  pytest.skip('Python 3.10 or higher is required', allow_module_level=True)
+
+
 from ollama._utils import _get_json_type, convert_function_to_tool, process_tools
 
 
@@ -15,7 +23,9 @@ def test_json_type_conversion():
 
 
 def test_function_to_tool_conversion():
-  def add_numbers(x: int, y: int | None = None) -> int:
+  from typing import Optional
+
+  def add_numbers(x: int, y: Optional[int] = None) -> int:
     """Add two numbers together.
     Args:
         x (integer): The first number
@@ -84,62 +94,6 @@ def all_types(
   assert set(tool.function.return_type) == {'string', 'integer', 'array', 'object'}
 
 
-#   assert tool.type == 'asjdlf'
-
-
-def test_function_with_all_typing_types():
-  from typing import Dict, List, Mapping, Optional, Sequence, Set, Tuple, Union
-
-  def all_types(
-    x: int,
-    y: str,
-    z: Sequence[int],
-    w: Mapping[str, int],
-    d: Dict[str, int],
-    s: Set[int],
-    t: Tuple[int, str],
-    l: List[int],  # noqa: E741
-    o: Optional[int],
-  ) -> Union[Mapping[str, int], str, None]:
-    """
-    A function with all types.
-    Args:
-        x (integer): The first number
-        y (string): The second number
-        z (array): The third number
-        w (object): The fourth number
-        d (object): The fifth number
-        s (array): The sixth number
-        t (array): The seventh number
-        l (array): The eighth number
-        o (integer | None): The ninth number
-    """
-    pass
-
-  tool = convert_function_to_tool(all_types)
-  assert tool.function.parameters.properties['x']['type'] == 'integer'
-  assert tool.function.parameters.properties['y']['type'] == 'string'
-  assert tool.function.parameters.properties['z']['type'] == 'array'
-  assert tool.function.parameters.properties['w']['type'] == 'object'
-  assert tool.function.parameters.properties['d']['type'] == 'object'
-  assert tool.function.parameters.properties['s']['type'] == 'array'
-  assert tool.function.parameters.properties['t']['type'] == 'array'
-  assert tool.function.parameters.properties['l']['type'] == 'array'
-  assert tool.function.parameters.properties['o']['type'] == 'integer'
-  assert set(tool.function.return_type) == {'string', 'object'}
-
-
-def test_function_without_docstring():
-  def simple_func(x: int):
-    pass
-
-  try:
-    convert_function_to_tool(simple_func)
-    assert AssertionError('Should raise ValueError')
-  except ValueError:
-    pass
-
-
 def test_process_tools():
   def func1(x: int) -> str:
     """Simple function 1.

tests/test_utils_legacy.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+import sys
+from typing import Dict, List, Mapping, Optional, Sequence, Set, Tuple, Union
+
+import pytest
+
+if sys.version_info >= (3, 10):
+  pytest.skip('Python 3.9 or lower is required', allow_module_level=True)
+
+from ollama._utils import _get_json_type, convert_function_to_tool
+
+
+def test_json_type_conversion():
+  # Test basic types
+  assert _get_json_type(str) == 'string'
+  assert _get_json_type(int) == 'integer'
+  assert _get_json_type(List) == 'array'
+  assert _get_json_type(Dict) == 'object'
+
+  # Test Optional
+  assert _get_json_type(Optional[str]) == 'string'
+
+
+def test_function_to_tool_conversion():
+  def add_numbers(x: int, y: Union[int, None] = None) -> int:  # Changed Optional to Union
+    """Add two numbers together.
+    Args:
+        x (integer): The first number
+        y (integer, optional): The second number
+
+    Returns:
+        integer: The sum of x and y
+    """
+    return x + y
+
+  tool = convert_function_to_tool(add_numbers)
+
+  assert tool['type'] == 'function'
+  assert tool['function']['name'] == 'add_numbers'
+  assert tool['function']['description'] == 'Add two numbers together.'
+  assert tool['function']['parameters']['type'] == 'object'
+  assert tool['function']['parameters']['properties']['x']['type'] == 'integer'
+  assert tool['function']['parameters']['properties']['x']['description'] == 'The first number'
+  assert tool['function']['parameters']['required'] == ['x']
+
+
+def test_function_with_all_typing_types():
+  def all_types(
+    x: int,
+    y: str,
+    z: Sequence[int],
+    w: Mapping[str, int],
+    d: Dict[str, int],
+    s: Set[int],
+    t: Tuple[int, str],
+    l: List[int],  # noqa: E741
+    o: Union[int, None],  # Changed Optional to Union
+  ) -> Union[Mapping[str, int], str, None]:
+    """
+    A function with all types.
+    Args:
+        x (integer): The first number
+        y (string): The second number
+        z (array): The third number
+        w (object): The fourth number
+        d (object): The fifth number
+        s (array): The sixth number
+        t (array): The seventh number
+        l (array): The eighth number
+        o (integer | None): The ninth number
+    """
+    pass
+
+  tool = convert_function_to_tool(all_types)
+  assert tool.function.parameters.properties['x']['type'] == 'integer'
+  assert tool.function.parameters.properties['y']['type'] == 'string'
+  assert tool.function.parameters.properties['z']['type'] == 'array'
+  assert tool.function.parameters.properties['w']['type'] == 'object'
+  assert tool.function.parameters.properties['d']['type'] == 'object'
+  assert tool.function.parameters.properties['s']['type'] == 'array'
+  assert tool.function.parameters.properties['t']['type'] == 'array'
+  assert tool.function.parameters.properties['l']['type'] == 'array'
+  assert tool.function.parameters.properties['o']['type'] == 'integer'
+  assert set(tool.function.return_type) == {'string', 'object'}