bohr-agent-sdk 0.1.17__py3-none-any.whl → 0.1.18__py3-none-any.whl

{bohr_agent_sdk-0.1.17.dist-info → bohr_agent_sdk-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bohr-agent-sdk
-Version: 0.1.17
+Version: 0.1.18
 Summary: SDK for scientific agents
 Home-page: https://github.com/dptech-corp/bohr-agent-sdk/
 Author: DP Technology

{bohr_agent_sdk-0.1.17.dist-info → bohr_agent_sdk-0.1.18.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dp/agent/__init__.py,sha256=4kwF1khocxEkqJjnVhBV5cCsWkR_MBGrUthuHk44pT8,153
 dp/agent/adapter/adk/__init__.py,sha256=x3OZoxHzBcSP3_LAK9oDulRN1vYkEfMEm5ZdocTLlQA,395
-dp/agent/adapter/adk/utils.py,sha256=S6Y9IuQngKXMg0fy8mcCiuAUvOGKYm0xzFFYicgc41I,7025
+dp/agent/adapter/adk/utils.py,sha256=Hf6zZOmNi0YSI9t5acmR5kzowWaYr-UfyPiN8fefPkI,7359
 dp/agent/adapter/adk/client/__init__.py,sha256=F1xfFNa4ZG8jV9adeGI2D3YBiSX-5RkvqEdTqNdJce4,209
 dp/agent/adapter/adk/client/calculation_mcp_tool.py,sha256=njEf4DvZt7HaAMpMZ1od2emWwlFUP5FtebBJ17pi20U,11774
 dp/agent/adapter/camel/__init__.py,sha256=RN1NhdmsJyN43fTxTXFld4UKZksjpSV0b2QvFn5gK7o,77
@@ -32,8 +32,8 @@ dp/agent/server/storage/bohrium_storage.py,sha256=iJqssa6JX3crlaTYGdpmzgOa0X_AbF
 dp/agent/server/storage/http_storage.py,sha256=KiySq7g9-iJr12XQCKKyJLn8wJoDnSRpQAR5_qPJ1ZU,1471
 dp/agent/server/storage/local_storage.py,sha256=t1wfjByjXew9ws3PuUxWxmZQ0-Wt1a6t4wmj3fW62GI,1352
 dp/agent/server/storage/oss_storage.py,sha256=pgjmi7Gir3Y5wkMDCvU4fvSls15fXT7Ax-h9MYHFPK0,3359
-bohr_agent_sdk-0.1.17.dist-info/METADATA,sha256=Wn0wUU7TBvmlJZeswoD6wtr7tiYX8WRDDbaVI-Ilwt4,6329
-bohr_agent_sdk-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bohr_agent_sdk-0.1.17.dist-info/entry_points.txt,sha256=5n5kneF5IbDQtoQ2WfF-QuBjDtsimJte9Rv9baSGgc0,86
-bohr_agent_sdk-0.1.17.dist-info/top_level.txt,sha256=87xLUDhu_1nQHoGLwlhJ6XlO7OsjILh6i1nX6ljFzDo,3
-bohr_agent_sdk-0.1.17.dist-info/RECORD,,
+bohr_agent_sdk-0.1.18.dist-info/METADATA,sha256=ok3x3E4bx8pvAceeRduWQEhVMu4311OquVUG0dE68AU,6329
+bohr_agent_sdk-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bohr_agent_sdk-0.1.18.dist-info/entry_points.txt,sha256=5n5kneF5IbDQtoQ2WfF-QuBjDtsimJte9Rv9baSGgc0,86
+bohr_agent_sdk-0.1.18.dist-info/top_level.txt,sha256=87xLUDhu_1nQHoGLwlhJ6XlO7OsjILh6i1nX6ljFzDo,3
+bohr_agent_sdk-0.1.18.dist-info/RECORD,,

dp/agent/adapter/adk/utils.py

@@ -116,6 +116,7 @@ def search_error_in_memory_handler(toolset):
 def extract_job_info(events: List[Event]) -> dict:
     jobs = {}
     artifacts = {}
+    events.sort(key=lambda event: event.timestamp)
     for event in events:
         if event.content and event.content.parts:
             for part in event.content.parts:
@@ -135,39 +136,42 @@ def extract_job_info(events: List[Event]) -> dict:
                         }
                     job = jobs[resp.id]
                     job["timestamp"] = event.timestamp
-                    if "result" in resp.response and isinstance(
-                            resp.response["result"], types.CallToolResult):
-                        res = resp.response["result"]
+                    res = resp.response.get("result")
+                    if isinstance(res, dict) and "content" in res \
+                            and "isError" in res:
+                        res = types.CallToolResult(
+                            content=res["content"], isError=res["isError"])
+                    if isinstance(res, types.CallToolResult):
                         if res.isError:
                             err_msg = res.content[0].text
                             if err_msg.startswith("Error executing tool"):
                                 err_msg = err_msg[err_msg.find(":")+2:]
                             job["err_msg"] = err_msg
-                        else:
+                        elif hasattr(res.content[0], "text"):
                             result = jsonpickle.loads(res.content[0].text)
                             if "job_id" not in result:
                                 job["result"] = result
-                    if hasattr(res.content[0], "job_info"):
-                        job_info = res.content[0].job_info
-                        job.update(job_info)
-                        for name, art in job_info.get(
-                                "input_artifacts", {}).items():
-                            if art["uri"] not in artifacts:
-                                artifacts[art["uri"]] = {
-                                    "type": "input",
-                                    "name": name,
-                                    "job_id": job_info["job_id"],
-                                    **art,
-                                }
-                        for name, art in job_info.get(
-                                "output_artifacts", {}).items():
-                            if art["uri"] not in artifacts:
-                                artifacts[art["uri"]] = {
-                                    "type": "output",
-                                    "name": name,
-                                    "job_id": job_info["job_id"],
-                                    **art,
-                                }
+                        if hasattr(res.content[0], "job_info"):
+                            job_info = res.content[0].job_info
+                            job.update(job_info)
+                            for name, art in job_info.get(
+                                    "input_artifacts", {}).items():
+                                if art["uri"] not in artifacts:
+                                    artifacts[art["uri"]] = {
+                                        "type": "input",
+                                        "name": name,
+                                        "job_id": job_info["job_id"],
+                                        **art,
+                                    }
+                            for name, art in job_info.get(
+                                    "output_artifacts", {}).items():
+                                if art["uri"] not in artifacts:
+                                    artifacts[art["uri"]] = {
+                                        "type": "output",
+                                        "name": name,
+                                        "job_id": job_info["job_id"],
+                                        **art,
+                                    }
     return {
         "jobs": list(jobs.values()),
         "artifacts": list(artifacts.values()),