Release reasy

Jasson · Oct 11, 2024 · 03e027d · 03e027d
1 parent c77332d
commit 03e027d
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 180 deletions.
diff --git a/evals/models/openai/calculator.py b/evals/models/openai/calculator.py
@@ -14,7 +14,6 @@ def multiply_and_exponentiate():
         ),
         question="What is 10*5 then to the power of 2? do it step by step",
         ideal_answer="2500",
-        save_result_to_file="evals/results/calculator/{eval_id}.json",
     )
     result: Optional[EvalResult] = evaluation.print_result()
 
@@ -29,7 +28,6 @@ def factorial():
         ),
         question="What is 10!?",
         ideal_answer="3628800",
-        save_result_to_file="evals/results/calculator/{eval_id}.json",
     )
     result: Optional[EvalResult] = evaluation.print_result()
 

diff --git a/phi/app/base.py b/phi/app/base.py
@@ -3,7 +3,7 @@
 from pydantic import field_validator, Field
 from pydantic_core.core_schema import ValidationInfo
 
-from phi.base.infra import InfraBase
+from phi.infra.base import InfraBase
 from phi.app.context import ContainerContext
 from phi.resource.base import ResourceBase
 from phi.utils.log import logger

diff --git a/phi/base/__init__.py b/phi/base/__init__.py
diff --git a/phi/base/infra.py → phi/infra/base.py b/phi/base/infra.py → phi/infra/base.py
diff --git a/phi/infra/resources.py b/phi/infra/resources.py
@@ -1,6 +1,6 @@
 from typing import Optional, List, Any, Tuple
 
-from phi.base.infra import InfraBase
+from phi.infra.base import InfraBase
 
 
 class InfraResources(InfraBase):

diff --git a/phi/model/openai/chat.py b/phi/model/openai/chat.py
@@ -495,8 +495,9 @@ def _update_usage_metrics(
                 elif isinstance(response_usage.prompt_tokens_details, BaseModel):
                     metrics.prompt_tokens_details = response_usage.prompt_tokens_details.model_dump(exclude_none=True)
                 assistant_message.metrics["prompt_tokens_details"] = metrics.prompt_tokens_details
-                for k, v in metrics.prompt_tokens_details.items():
-                    self.metrics.get("prompt_tokens_details", {}).get(k, 0) + v
+                if metrics.prompt_tokens_details is not None:
+                    for k, v in metrics.prompt_tokens_details.items():
+                        self.metrics.get("prompt_tokens_details", {}).get(k, 0) + v
             if response_usage.completion_tokens_details is not None:
                 if isinstance(response_usage.completion_tokens_details, dict):
                     metrics.completion_tokens_details = response_usage.completion_tokens_details
@@ -505,8 +506,9 @@ def _update_usage_metrics(
                         exclude_none=True
                     )
                 assistant_message.metrics["completion_tokens_details"] = metrics.completion_tokens_details
-                for k, v in metrics.completion_tokens_details.items():
-                    self.metrics.get("completion_tokens_details", {}).get(k, 0) + v
+                if metrics.completion_tokens_details is not None:
+                    for k, v in metrics.completion_tokens_details.items():
+                        self.metrics.get("completion_tokens_details", {}).get(k, 0) + v
 
     def _create_assistant_message(
         self,

diff --git a/phi/resource/base.py b/phi/resource/base.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Any, Optional, Dict, List
 
-from phi.base.infra import InfraBase
+from phi.infra.base import InfraBase
 from phi.utils.log import logger
 
 

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
@@ -31,7 +31,7 @@ main() {
   if [[ UPGRADE_ALL -eq 1 ]];
   then
     print_heading "Upgrading all dependencies to latest version"
-    CUSTOM_COMPILE_COMMAND="./scripts/upgrade.sh" \
+    CUSTOM_COMPILE_COMMAND="./scripts/upgrade.sh all" \
       pip-compile --upgrade --no-annotate --pip-args "--no-cache-dir" \
       -o ${ROOT_DIR}/requirements.txt \
       ${ROOT_DIR}/pyproject.toml

diff --git a/tests/llms/__init__.py b/tests/llms/__init__.py
diff --git a/tests/llms/ollama/__init__.py b/tests/llms/ollama/__init__.py
diff --git a/tests/llms/ollama/multi_tool_test.py b/tests/llms/ollama/multi_tool_test.py
diff --git a/tests/llms/ollama/structured_output.py b/tests/llms/ollama/structured_output.py
diff --git a/tests/llms/openai/__init__.py b/tests/llms/openai/__init__.py
diff --git a/tests/llms/openai/test_easy.py b/tests/llms/openai/test_easy.py