Skip to content

Commit 36f9a7a

Browse files
committed
add root_trace_id to update
1 parent 36636ae commit 36f9a7a

File tree

10 files changed

+13
-19
lines changed

10 files changed

+13
-19
lines changed

parea/client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from typing import Any, AsyncIterable, Callable, Dict, Iterable, List, Optional, Union
2-
31
import asyncio
42
import logging
53
import os
64
import time
5+
from typing import Any, AsyncIterable, Callable, Dict, Iterable, List, Optional, Union
76

87
import httpx
98
from attrs import asdict, define, field
@@ -14,7 +13,8 @@
1413
from parea.cache.cache import Cache
1514
from parea.constants import PAREA_OS_ENV_EXPERIMENT_UUID
1615
from parea.experiment.datasets import create_test_cases, create_test_collection
17-
from parea.helpers import gen_trace_id, serialize_metadata_values, structure_trace_log_from_api, structure_trace_logs_from_api
16+
from parea.helpers import gen_trace_id, serialize_metadata_values, structure_trace_log_from_api, \
17+
structure_trace_logs_from_api
1818
from parea.parea_logger import parea_logger
1919
from parea.schemas import EvaluationResult
2020
from parea.schemas.models import (
@@ -32,16 +32,16 @@
3232
ListExperimentUUIDsFilters,
3333
ProjectSchema,
3434
TestCaseCollection,
35-
TraceLog,
3635
TraceLogFilters,
3736
TraceLogTree,
3837
UseDeployedPrompt,
3938
UseDeployedPromptResponse,
4039
)
41-
from parea.utils.trace_utils import get_current_trace_id, get_root_trace_id, logger_all_possible, logger_record_log, trace_data
40+
from parea.utils.trace_utils import get_current_trace_id, get_root_trace_id, logger_all_possible, trace_data
4241

4342
load_dotenv()
4443

44+
4545
logger = logging.getLogger()
4646

4747
COMPLETION_ENDPOINT = "/completion"

parea/cookbook/guidance/tracing_guidance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

33
from dotenv import load_dotenv
4-
from guidance import assistant, gen, models, select, user
4+
from guidance import assistant, gen, models, user
55

66
from parea import Parea, trace
77

parea/cookbook/langchain/trace_langchain_RAG_evals.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import boto3
66
from dotenv import load_dotenv
7-
87
# LangChain libs
98
from langchain.chat_models import ChatOpenAI
109
from langchain.document_loaders import RecursiveUrlLoader
@@ -13,7 +12,6 @@
1312
from langchain.prompts import ChatPromptTemplate
1413
from langchain.schema.output_parser import StrOutputParser
1514
from langchain.text_splitter import TokenTextSplitter
16-
from langchain.vectorstores import Chroma
1715
from langchain_community.llms.bedrock import Bedrock
1816
from langchain_community.vectorstores.faiss import FAISS
1917

parea/cookbook/parea_llm_proxy/tracing_with_parea_streaming.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import asyncio
21
import os
32

43
from dotenv import load_dotenv

parea/evals/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
from openai import __version__ as openai_version
1111

1212
from parea.parea_logger import parea_logger
13-
from parea.schemas import EvaluationResult, Log
13+
from parea.schemas import EvaluationResult
1414
from parea.schemas.log import Log
15-
from parea.schemas.models import UpdateLog
1615
from parea.utils.trace_utils import thread_ids_running_evals, trace_data
1716

1817
seg = pysbd.Segmenter(language="en", clean=False)

parea/experiment/cli.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import argparse
44
import csv
5-
import importlib
65
import os
76
import sys
87
import traceback
@@ -18,8 +17,8 @@ def load_from_path(module_path):
1817
sys.path.insert(0, dir_name)
1918

2019
module_name = os.path.basename(module_path)
21-
spec = importlib.util.spec_from_file_location(module_name, module_path)
22-
module = importlib.util.module_from_spec(spec)
20+
spec = util.spec_from_file_location(module_name, module_path)
21+
module = util.module_from_spec(spec)
2322
spec.loader.exec_module(module)
2423

2524
if spec.name not in sys.modules:

parea/parea_logger.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ async def arecord_log(self, data: TraceLog) -> None:
5353
data=asdict(data),
5454
)
5555

56-
def write_log(self, data: TraceLog) -> None:
57-
data = serialize_metadata_values(data)
58-
5956
def default_log(self, data: TraceLog) -> None:
6057
if self._client:
6158
if data.target:

parea/schemas/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ class CacheRequest:
159159
class UpdateLog:
160160
trace_id: str
161161
field_name_to_value_map: Dict[str, Any]
162+
root_trace_id: Optional[str] = None
162163

163164

164165
@define

parea/utils/trace_integrations/instructor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ def __call__(
8787
instructor_val_errs.set(instructor_val_errs.get() + reasons)
8888

8989
report_instructor_validation_errors()
90-
logger_update_record(UpdateLog(trace_id=trace_id, field_name_to_value_map={"scores": trace_data.get()[trace_id].scores}))
90+
current_log = trace_data.get()[trace_id]
91+
logger_update_record(UpdateLog(trace_id=trace_id, field_name_to_value_map={"scores": current_log.scores}, root_trace_id=current_log.root_trace_id))
9192

9293
raise e
9394

parea/wrapper/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from parea.constants import ALL_NON_AZURE_MODELS_INFO, AZURE_MODEL_INFO
1212
from parea.parea_logger import parea_logger
1313
from parea.schemas.log import LLMInputs, Message, ModelParams, Role
14-
from parea.schemas.models import UpdateLog, UpdateTraceScenario
14+
from parea.schemas.models import UpdateTraceScenario
1515
from parea.utils.trace_utils import fill_trace_data, get_current_trace_id, log_in_thread, trace_data, trace_insert
1616
from parea.utils.universal_encoder import json_dumps
1717

0 commit comments

Comments
 (0)