Skip to content

Commit 03e027d

Browse files
committed
Release reasy
1 parent c77332d commit 03e027d

File tree

14 files changed

+10
-180
lines changed

14 files changed

+10
-180
lines changed

evals/models/openai/calculator.py

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ def multiply_and_exponentiate():
1414
),
1515
question="What is 10*5 then to the power of 2? do it step by step",
1616
ideal_answer="2500",
17-
save_result_to_file="evals/results/calculator/{eval_id}.json",
1817
)
1918
result: Optional[EvalResult] = evaluation.print_result()
2019

@@ -29,7 +28,6 @@ def factorial():
2928
),
3029
question="What is 10!?",
3130
ideal_answer="3628800",
32-
save_result_to_file="evals/results/calculator/{eval_id}.json",
3331
)
3432
result: Optional[EvalResult] = evaluation.print_result()
3533

phi/app/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from pydantic import field_validator, Field
44
from pydantic_core.core_schema import ValidationInfo
55

6-
from phi.base.infra import InfraBase
6+
from phi.infra.base import InfraBase
77
from phi.app.context import ContainerContext
88
from phi.resource.base import ResourceBase
99
from phi.utils.log import logger

phi/base/__init__.py

Whitespace-only changes.
File renamed without changes.

phi/infra/resources.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Optional, List, Any, Tuple
22

3-
from phi.base.infra import InfraBase
3+
from phi.infra.base import InfraBase
44

55

66
class InfraResources(InfraBase):

phi/model/openai/chat.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,9 @@ def _update_usage_metrics(
495495
elif isinstance(response_usage.prompt_tokens_details, BaseModel):
496496
metrics.prompt_tokens_details = response_usage.prompt_tokens_details.model_dump(exclude_none=True)
497497
assistant_message.metrics["prompt_tokens_details"] = metrics.prompt_tokens_details
498-
for k, v in metrics.prompt_tokens_details.items():
499-
self.metrics.get("prompt_tokens_details", {}).get(k, 0) + v
498+
if metrics.prompt_tokens_details is not None:
499+
for k, v in metrics.prompt_tokens_details.items():
500+
self.metrics.get("prompt_tokens_details", {}).get(k, 0) + v
500501
if response_usage.completion_tokens_details is not None:
501502
if isinstance(response_usage.completion_tokens_details, dict):
502503
metrics.completion_tokens_details = response_usage.completion_tokens_details
@@ -505,8 +506,9 @@ def _update_usage_metrics(
505506
exclude_none=True
506507
)
507508
assistant_message.metrics["completion_tokens_details"] = metrics.completion_tokens_details
508-
for k, v in metrics.completion_tokens_details.items():
509-
self.metrics.get("completion_tokens_details", {}).get(k, 0) + v
509+
if metrics.completion_tokens_details is not None:
510+
for k, v in metrics.completion_tokens_details.items():
511+
self.metrics.get("completion_tokens_details", {}).get(k, 0) + v
510512

511513
def _create_assistant_message(
512514
self,

phi/resource/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pathlib import Path
22
from typing import Any, Optional, Dict, List
33

4-
from phi.base.infra import InfraBase
4+
from phi.infra.base import InfraBase
55
from phi.utils.log import logger
66

77

scripts/upgrade.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ main() {
3131
if [[ UPGRADE_ALL -eq 1 ]];
3232
then
3333
print_heading "Upgrading all dependencies to latest version"
34-
CUSTOM_COMPILE_COMMAND="./scripts/upgrade.sh" \
34+
CUSTOM_COMPILE_COMMAND="./scripts/upgrade.sh all" \
3535
pip-compile --upgrade --no-annotate --pip-args "--no-cache-dir" \
3636
-o ${ROOT_DIR}/requirements.txt \
3737
${ROOT_DIR}/pyproject.toml

tests/llms/__init__.py

Whitespace-only changes.

tests/llms/ollama/__init__.py

Whitespace-only changes.

tests/llms/ollama/multi_tool_test.py

-88
This file was deleted.

tests/llms/ollama/structured_output.py

-42
This file was deleted.

tests/llms/openai/__init__.py

Whitespace-only changes.

tests/llms/openai/test_easy.py

-40
This file was deleted.

0 commit comments

Comments
 (0)