veadk-python 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

veadk/evaluation/deepeval_evaluator/deepeval_evaluator.py

@@ -52,7 +52,7 @@ class DeepevalEvaluator(BaseEvaluator):
             "https://ark.cn-beijing.volces.com/api/v3/",
         ),
         name: str = "veadk_deepeval_evaluator",
-        prometheus_config: PrometheusPushgatewayConfig = None,
+        prometheus_config: PrometheusPushgatewayConfig | None = None,
     ):
         super().__init__(agent=agent, name=name)
 
@@ -73,11 +73,9 @@ class DeepevalEvaluator(BaseEvaluator):
         eval_id: str = f"test_{formatted_timestamp()}",
     ):
         """Target to Google ADK, we will use the same evaluation case format as Google ADK."""
-        for metric in metrics:
-            if not metric.model:
-                metric.model = self.judge_model
         # Get evaluation data by parsing eval set file
         self.generate_eval_data(eval_set_file_path)
+
         # Get actual data by running agent
         logger.info("Start to run agent for actual data.")
         await self._run_agent_for_actual_data()

veadk/tracing/telemetry/exporters/inmemory_exporter.py

@@ -83,6 +83,3 @@ class InMemoryExporter(BaseModel, BaseExporter):
         self._real_exporter = self._exporter
         processor = export.SimpleSpanProcessor(self._exporter)
         return processor, None
-
-    def get_meter_context(self) -> Any:
-        return None

veadk/tracing/telemetry/opentelemetry_tracer.py

@@ -19,12 +19,11 @@ import time
 from typing import Any
 
 from openinference.instrumentation.google_adk import GoogleADKInstrumentor
-from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry import trace as trace_api
+from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, SimpleSpanProcessor
-
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import override
 
@@ -62,28 +61,19 @@ class OpentelemetryTracer(BaseModel, BaseTracer):
 
     def model_post_init(self, context: Any, /) -> None:
         self._processors = []
-        self._inmemory_exporter: InMemoryExporter = None
-        self._apiserver_exporter: ApiServerExporter = None
-        # Inmemory & APIServer are the default exporters
-        have_inmemory_exporter = False
-        have_apiserver_exporter = False
+        self._inmemory_exporter: InMemoryExporter | None = None
+
+        # InMemoryExporter is a default exporter for exporting local tracing file
         for exporter in self.exporters:
             if isinstance(exporter, InMemoryExporter):
-                have_inmemory_exporter = True
                 self._inmemory_exporter = exporter
-            elif isinstance(exporter, ApiServerExporter):
-                have_apiserver_exporter = True
-                self._apiserver_exporter = exporter
-
-        if not have_inmemory_exporter:
-            inmemory_exporter = InMemoryExporter()
-            self.exporters.append(inmemory_exporter)
-            self._inmemory_exporter = inmemory_exporter
-        if not have_apiserver_exporter:
-            apiserver_exporter = ApiServerExporter()
-            self.exporters.append(apiserver_exporter)
-            self._apiserver_exporter = apiserver_exporter
 
+        if self._inmemory_exporter is None:
+            self._inmemory_exporter = InMemoryExporter()
+            self.exporters.append(self._inmemory_exporter)
+        # ========================================================================
+
+        # Process meter-related attributes
         self._meter_contexts = []
         self._meter_uploaders = []
         for exporter in self.exporters:
@@ -94,25 +84,24 @@ class OpentelemetryTracer(BaseModel, BaseTracer):
         for meter_context in self._meter_contexts:
             meter_uploader = MeterUploader(meter_context)
             self._meter_uploaders.append(meter_uploader)
+        # ================================
 
         # init tracer provider
+        # VeADK operates on global OpenTelemetry provider, hence return nothing
         self._init_tracer_provider()
 
         # just for debug
         self._trace_file_path = ""
 
-        # patch this before starting instrumentation
-        # enable_veadk_tracing(self.dump)
-
         GoogleADKInstrumentor().instrument()
 
-    def _init_tracer_provider(self):
+    def _init_tracer_provider(self) -> None:
         # 1. get global trace provider
         global_tracer_provider = trace_api.get_tracer_provider()
 
         if not isinstance(global_tracer_provider, TracerProvider):
             logger.info(
-                f"Global tracer provider has not been set. Create tracer provider and set it now."
+                "Global tracer provider has not been set. Create tracer provider and set it now."
             )
             # 1.1 init tracer provider
             tracer_provider = trace_sdk.TracerProvider()
@@ -123,17 +112,25 @@ class OpentelemetryTracer(BaseModel, BaseTracer):
         # 2. check if apmplus exporter is already exist
         for processor in global_tracer_provider._active_span_processor._span_processors:
             if isinstance(processor, (BatchSpanProcessor, SimpleSpanProcessor)):
-                # check exporter endpoint
-                if "apmplus" in processor.span_exporter._endpoint:
-                    have_apmplus_exporter = True
+                # try to get endpoint, in case of exporter has no _endpoint attribute
+                try:
+                    exporter_endpoint = processor.span_exporter._endpoint
+                    if "apmplus" in exporter_endpoint:
+                        have_apmplus_exporter = True
+                except AttributeError:
+                    # log a warning and pass this exporter
+                    logger.warning(
+                        f"Exporter {processor.span_exporter} has no endpoint."
+                    )
 
         # 3. add exporters to global tracer_provider
         # range over a copy of exporters to avoid index issues
+        if have_apmplus_exporter:
+            self.exporters = [
+                e for e in self.exporters if not isinstance(e, APMPlusExporter)
+            ]
+
         for exporter in self.exporters[:]:
-            if have_apmplus_exporter and isinstance(exporter, APMPlusExporter):
-                # apmplus exporter has been int in global tracer provider, need to remove from exporters.
-                self.exporters.remove(exporter)
-                continue
             processor, resource_attributes = exporter.get_processor()
             if resource_attributes is not None:
                 update_resource_attributions(
@@ -144,7 +141,6 @@ class OpentelemetryTracer(BaseModel, BaseTracer):
             self._processors.append(processor)
         logger.debug(f"Init OpentelemetryTracer with {len(self.exporters)} exporters.")
 
-
     @override
     def dump(
         self,
@@ -152,6 +148,12 @@ class OpentelemetryTracer(BaseModel, BaseTracer):
         session_id: str,
         path: str = "/tmp",
     ) -> str:
+        if not self._inmemory_exporter:
+            logger.warning(
+                "InMemoryExporter is not initialized. Please check your tracer exporters."
+            )
+            return ""
+
         prompt_tokens = self._inmemory_exporter._real_exporter.prompt_tokens
         completion_tokens = self._inmemory_exporter._real_exporter.completion_tokens
 

veadk/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.2.0"
+VERSION = "0.2.1"

{veadk_python-0.2.0.dist-info → veadk_python-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veadk-python
-Version: 0.2.0
+Version: 0.2.1
 Summary: Volcengine agent development kit, integrations with Volcengine cloud services.
 Author-email: Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>, Zhi Han <sliverydayday@gmail.com>, Meng Wang <mengwangwm@gmail.com>
 Requires-Python: >=3.10

{veadk_python-0.2.0.dist-info → veadk_python-0.2.1.dist-info}/RECORD

@@ -4,14 +4,14 @@ veadk/config.py,sha256=UFUgzL4fTRlM_LIyutP50dvxtKOuFeMhL5TPEOO7r2k,4109
 veadk/consts.py,sha256=DIVr-sXQahrlJoPiTfsDL0y_pX8w-LLXHDsubL5w13k,802
 veadk/runner.py,sha256=dRp4Qws_m7CJZ8zCsQ36kklGmUWBtLJnUgHj9eBZJZE,9049
 veadk/types.py,sha256=pFwBNu93xldy23j4tycpdpKUvpeg_8Ho5hhf-DCsKQg,864
-veadk/version.py,sha256=h5cjjBcsI-2YIWb4SguJh0VQ8bYS6bGTBkrDKg5qtls,653
+veadk/version.py,sha256=wz7JV-NDeTza7ICAj0QLylkGkfJudZdTdvWKGp7pJZ0,653
 veadk/__pycache__/__init__.cpython-310.pyc,sha256=v0cSDrRHlquyZln9_R2jx6Wv_Pujx04sLZzBk11dLeM,525
 veadk/__pycache__/agent.cpython-310.pyc,sha256=7CvnelBRN-zt_Jb6LJUON9PTmTYsxayks-Irh3TIfv0,7581
 veadk/__pycache__/config.cpython-310.pyc,sha256=bw0rq7_E755cNXE3gCblQcrYlFSdH3DTFnIBQVeGcgs,3220
 veadk/__pycache__/consts.cpython-310.pyc,sha256=xxHPN1lv6ORHp3SyxIp4MPFTwSM8XkW44DGzsf4QB4I,321
 veadk/__pycache__/runner.cpython-310.pyc,sha256=rg8MRn6WU58AE56CekPqOM_phCFHOgODr-rzwzDXpgE,6126
 veadk/__pycache__/types.cpython-310.pyc,sha256=s9SBY3yiOEm5zuPugvJnuYWNdVTWJv8ioLOv40okJ6I,412
-veadk/__pycache__/version.cpython-310.pyc,sha256=rPmRU_nEMRrsHfXADXr3Q7ls08P8kUmWtnz3lax2_9I,165
+veadk/__pycache__/version.cpython-310.pyc,sha256=Y13TKX-01Df6C7exvvT92umdtfPjQ9PF7nvmo6m8FiE,165
 veadk/a2a/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/a2a/agent_card.py,sha256=lhtgW1acMpxYUdULHEZwVFXOi6Xh4lNkf4S7QIhbFFI,1525
 veadk/a2a/remote_ve_agent.py,sha256=l7qqEShvuKRnPtLZfVKFdma1-Xtr7Wk0k6XtFkMDSSU,1256
@@ -439,7 +439,7 @@ veadk/evaluation/adk_evaluator/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh
 veadk/evaluation/adk_evaluator/adk_evaluator.py,sha256=v3IiIFyg6S1Ik9TAYo-3ZaF_JvEhAXQtwmqkv8rL6Rc,10193
 veadk/evaluation/adk_evaluator/__pycache__/__init__.cpython-310.pyc,sha256=qHSnTNUwWv_RrGxWvTHSbwDqKikXYVf-7yyzgPeRljY,174
 veadk/evaluation/deepeval_evaluator/__init__.py,sha256=lLGtRvWhwDy4u7hmtZxZbPmdMzM58pSjEwEF34NqW-4,718
-veadk/evaluation/deepeval_evaluator/deepeval_evaluator.py,sha256=DXAOev7pkxr11SG3eYzXlUloZ39789qHT0tm19nQHx8,8546
+veadk/evaluation/deepeval_evaluator/deepeval_evaluator.py,sha256=rbEn0tKFqWSMSF8mpcgD0YVSHeHzU5acej7q6DDzQQY,8442
 veadk/evaluation/deepeval_evaluator/__pycache__/__init__.cpython-310.pyc,sha256=S4zNa-BCsyL7xBDoMMUxVki492LcCitIke4wvwywXmc,261
 veadk/evaluation/deepeval_evaluator/__pycache__/deepeval_evaluator.cpython-310.pyc,sha256=PlbOq3bSpDHFS5QFFl8aPMTOcDJAJ7MhsJIS1tPuPaw,5267
 veadk/evaluation/utils/prometheus.py,sha256=4Jhx5T8ibdcY6EdpOaTFqBJRIKFMCbx7qlDZP00X-a0,3868
@@ -493,22 +493,22 @@ veadk/tracing/base_tracer.py,sha256=8Al5erGk-tJ-7qJsbC0e050eR4SAOk3e2OL3dgLncjk,
 veadk/tracing/__pycache__/__init__.cpython-310.pyc,sha256=jMzJwkEztEGTn9vCjIJfPrB4VQyc3Z8fi4pEUXYyWS8,157
 veadk/tracing/__pycache__/base_tracer.cpython-310.pyc,sha256=_EHjlUlH84rhL1OJEsh9lBwoT13XR2MW7g6qN6ssZDA,4416
 veadk/tracing/telemetry/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
-veadk/tracing/telemetry/opentelemetry_tracer.py,sha256=CYi43LmTKCB1I4Ja8Ua1BP3XtORiM-LmW_zApLJqMNI,8346
+veadk/tracing/telemetry/opentelemetry_tracer.py,sha256=W4_Z5hBpLgwbWjV_DPYhmQCVDgrZ9zJMuDnQ6dkbp60,8415
 veadk/tracing/telemetry/__pycache__/__init__.cpython-310.pyc,sha256=AwKg0L0Ii4rvjSndNNJHS3YYvJymicd36IVfrjEHzxc,167
-veadk/tracing/telemetry/__pycache__/opentelemetry_tracer.cpython-310.pyc,sha256=80wkIctyU_IV8z6Gf9FHpA_nH6_7d7F1fVOBBljtiTo,4611
+veadk/tracing/telemetry/__pycache__/opentelemetry_tracer.cpython-310.pyc,sha256=Y0c58qf20FtDkMHpLuMwQY0FoUlOgYrELhQORjAdAbs,5702
 veadk/tracing/telemetry/exporters/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/tracing/telemetry/exporters/apiserver_exporter.py,sha256=Xn7CJASHjWMiSJZ7J6hEmK66P6h6jVx7xVH627IVhUM,2239
 veadk/tracing/telemetry/exporters/apmplus_exporter.py,sha256=qC49saKDKZnCRy-y11xoR8iFco3iwzB08QPYRDYABcg,3707
 veadk/tracing/telemetry/exporters/base_exporter.py,sha256=c4Py27xPt-FhvKnOMrCj-3GBpj2cmjrm8mkOtDpvDRg,890
 veadk/tracing/telemetry/exporters/cozeloop_exporter.py,sha256=a2oUjR01k0LkeXZ56AG7FuuCK_qnQ0Zg5VpDkm_y1NQ,2386
-veadk/tracing/telemetry/exporters/inmemory_exporter.py,sha256=LHVt-ZJqhsRp0sddUFHc2Aq0Vl2nJHdO5xTTLQQnZM0,3288
+veadk/tracing/telemetry/exporters/inmemory_exporter.py,sha256=ChNG3pCB9D9zr42GruDHxhfcIdidVXQqeGfjpnKsjJI,3227
 veadk/tracing/telemetry/exporters/tls_exporter.py,sha256=GEHKyNDdWuPNhG7aHsIq3cTN99Fc_caMrEv-FfULb6Y,2677
 veadk/tracing/telemetry/exporters/__pycache__/__init__.cpython-310.pyc,sha256=wI_WBNa7P0nVDc5HUZriRqr4chtdQ-YvnkxC9K7orKc,177
 veadk/tracing/telemetry/exporters/__pycache__/apiserver_exporter.cpython-310.pyc,sha256=Hfrj2XvLyCtm4TWtYRrs6pFTLtu3_lCkK6QNKFUPRGo,2176
 veadk/tracing/telemetry/exporters/__pycache__/apmplus_exporter.cpython-310.pyc,sha256=8sM8NDZWnCT4262g54p4rNRvuTU3EzVzZ9_U_bvWt94,3410
 veadk/tracing/telemetry/exporters/__pycache__/base_exporter.cpython-310.pyc,sha256=OBr1qAJnArckgL0gZrh0xFfFlcDmxxXpdfNiGloJnBE,867
 veadk/tracing/telemetry/exporters/__pycache__/cozeloop_exporter.cpython-310.pyc,sha256=7mRzr-ahhg9Ts8_HlfFE9phCVnWOkbdyRVVK8CEzidk,2344
-veadk/tracing/telemetry/exporters/__pycache__/inmemory_exporter.cpython-310.pyc,sha256=xHsaR9BQtQP3SSpuH4kDdq18r612o2pzV8i1fXDv2h4,3235
+veadk/tracing/telemetry/exporters/__pycache__/inmemory_exporter.cpython-310.pyc,sha256=hv8CIPEqlC6mQmEtm21x1FXVhZ36kqpBB3eEYL4YBcI,3084
 veadk/tracing/telemetry/exporters/__pycache__/tls_exporter.cpython-310.pyc,sha256=_qblkapkb-7hutrshQugTTdKasdBLFKP13MoC29jOZI,2626
 veadk/tracing/telemetry/metrics/__init__.py,sha256=pkSabKw7_ai4NOo56pXKL40EcaxIDh6HYxPXOY7qWbo,634
 veadk/tracing/telemetry/metrics/opentelemetry_metrics.py,sha256=0VcEfQqPF17tgGZrUbF9JCbvzO-_o4cycid2j1DWAow,2715
@@ -526,9 +526,9 @@ veadk/utils/__pycache__/mcp_utils.cpython-310.pyc,sha256=Ju1AxX9uw1jyfssci5Fya8t
 veadk/utils/__pycache__/misc.cpython-310.pyc,sha256=HB9waD1DEzY1bVQDpWmR6ABF2aDentKNeNEuEtsBQjY,943
 veadk/utils/__pycache__/patches.cpython-310.pyc,sha256=1TjcvbZAAzRP5lIXLPi7bJTAxXmKWTgi_vXAR6wS0-8,1476
 veadk/utils/__pycache__/volcengine_sign.cpython-310.pyc,sha256=KPU675rYh3l4JkUwT9OO26yjTW5HLgI9fGRKG93oYiI,3219
-veadk_python-0.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-veadk_python-0.2.0.dist-info/METADATA,sha256=e1GeTioZCsbJ4JFnaub-t_a7TIuAzIQMTrOhfYjZ9PE,4338
-veadk_python-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-veadk_python-0.2.0.dist-info/entry_points.txt,sha256=su1TJC5YpYPk1o4I5uKOI8pjaR0wujhnjJeqQ-yk65U,45
-veadk_python-0.2.0.dist-info/top_level.txt,sha256=Qqi3ycJ4anKiZWBXtUBIy8zK9ZuXJsFa05oFq8O8qqY,6
-veadk_python-0.2.0.dist-info/RECORD,,
+veadk_python-0.2.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+veadk_python-0.2.1.dist-info/METADATA,sha256=3JKlfPm2e3AUEgaoP1nGX-V6z5xOpQhJe2M-u_Ajgd0,4338
+veadk_python-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+veadk_python-0.2.1.dist-info/entry_points.txt,sha256=su1TJC5YpYPk1o4I5uKOI8pjaR0wujhnjJeqQ-yk65U,45
+veadk_python-0.2.1.dist-info/top_level.txt,sha256=Qqi3ycJ4anKiZWBXtUBIy8zK9ZuXJsFa05oFq8O8qqY,6
+veadk_python-0.2.1.dist-info/RECORD,,