Skip to content

armgit / dspy

Public Imported from GitHub
0

DSPy: The framework for programming—not prompting—language models

Python

python 3.9 compatibility and cosmetic notebook changes

Herumb Shandilyae9bc7f258b0f
diff --git a/dspy/predict/avatar/avatar.py b/dspy/predict/avatar/avatar.py
index a7d6b4da2..7b7f56001 100644
--- a/dspy/predict/avatar/avatar.py
+++ b/dspy/predict/avatar/avatar.py
@@ -55,21 +55,20 @@ class Avatar(dspy.Module):
def _get_field(self, field_info: FieldInfo):
- match field_info.json_schema_extra['__dspy_field_type']:
- case 'input':
- return dspy.InputField(
- prefix=field_info.json_schema_extra['prefix'],
- desc=field_info.json_schema_extra['desc'],
- format=field_info.json_schema_extra['format'] if 'format' in field_info.json_schema_extra else None,
- )
- case 'output':
- return dspy.OutputField(
- prefix=field_info.json_schema_extra['prefix'],
- desc=field_info.json_schema_extra['desc'],
- format=field_info.json_schema_extra['format'] if 'format' in field_info.json_schema_extra else None,
- )
- case _:
- raise ValueError(f"Unknown field type: {field_info.json_schema_extra['__dspy_field_type']}")
+ if field_info.json_schema_extra['__dspy_field_type'] == 'input':
+ return dspy.InputField(
+ prefix=field_info.json_schema_extra['prefix'],
+ desc=field_info.json_schema_extra['desc'],
+ format=field_info.json_schema_extra['format'] if 'format' in field_info.json_schema_extra else None,
+ )
+ elif field_info.json_schema_extra['__dspy_field_type'] == 'output':
+ return dspy.OutputField(
+ prefix=field_info.json_schema_extra['prefix'],
+ desc=field_info.json_schema_extra['desc'],
+ format=field_info.json_schema_extra['format'] if 'format' in field_info.json_schema_extra else None,
+ )
+ else:
+ raise ValueError(f"Unknown field type: {field_info.json_schema_extra['__dspy_field_type']}")
def _update_signature(self, idx: int, omit_action: bool = False):
@@ -87,27 +86,26 @@ class Avatar(dspy.Module):
type_=str,
)
)
- match omit_action:
- case True:
- for field in list(self.output_fields.keys()):
- self.actor.signature = self.actor.signature.append(
- field,
- self._get_field(self.output_fields[field]),
- type_=self.output_fields[field].annotation,
- )
-
- case False:
+
+ if omit_action:
+ for field in list(self.output_fields.keys()):
self.actor.signature = self.actor.signature.append(
- f"action_{idx+1}",
- dspy.OutputField(
- prefix=f"Action {idx+1}:",
- desc=f"{get_number_with_suffix(idx+1)} action to taken",
- )
+ field,
+ self._get_field(self.output_fields[field]),
+ type_=self.output_fields[field].annotation,
)
- self.actor.signature = self.actor.signature.with_updated_fields(
- f"action_{idx+1}",
- Action,
+ else:
+ self.actor.signature = self.actor.signature.append(
+ f"action_{idx+1}",
+ dspy.OutputField(
+ prefix=f"Action {idx+1}:",
+ desc=f"{get_number_with_suffix(idx+1)} action to taken",
)
+ )
+ self.actor.signature = self.actor.signature.with_updated_fields(
+ f"action_{idx+1}",
+ Action,
+ )
def _call_tool(self, tool_name: str, tool_input_query: str) -> str:
diff --git a/dspy/teleprompt/avatar_optimizer.py b/dspy/teleprompt/avatar_optimizer.py
index 4e441971f..c41c6bfe5 100644
--- a/dspy/teleprompt/avatar_optimizer.py
+++ b/dspy/teleprompt/avatar_optimizer.py
@@ -120,7 +120,7 @@ class AvatarOptimizer(Teleprompter):
return 0
- def multi_thread_executor(self, devset, actor, return_outputs=False, num_threads=60):
+ def thread_safe_evaluator(self, devset, actor, return_outputs=False, num_threads=60):
total_score = 0
total_examples = len(devset)
results = []
@@ -153,7 +153,7 @@ class AvatarOptimizer(Teleprompter):
pos_inputs = []
neg_inputs = []
- avg_score, results = self.multi_thread_executor(trainset, actor, return_outputs=True)
+ avg_score, results = self.thread_safe_evaluator(trainset, actor, return_outputs=True)
print(f"Average Score: {avg_score}")
for example, prediction, score in results:
diff --git a/examples/agents/avatar_langchain_tools.ipynb b/examples/agents/avatar_langchain_tools.ipynb
index 3490c3181..68f34a004 100644
--- a/examples/agents/avatar_langchain_tools.ipynb
+++ b/examples/agents/avatar_langchain_tools.ipynb
@@ -149,20 +149,20 @@
"\n",
"\n",
"sqa_train = [\n",
- " dspy.Example(question=example.question, answer=\",\".join(example.answers))\n",
+ " dspy.Example(question=example.question, answer=\",\".join(example.answers)).with_inputs(\"question\")\n",
" for example in sample(searchqa, 200)\n",
"]\n",
"sqa_test = [\n",
- " dspy.Example(question=example.question, answer=\",\".join(example.answers))\n",
+ " dspy.Example(question=example.question, answer=\",\".join(example.answers)).with_inputs(\"question\")\n",
" for example in sample(searchqa, 100)\n",
"]\n",
"\n",
"aqa_train = [\n",
- " dspy.Example(question=example.question, paper_id=example.paper_id, answer=example.answer)\n",
+ " dspy.Example(question=example.question, paper_id=example.paper_id, answer=example.answer).with_inputs(\"question\", \"paper_id\")\n",
" for example in sample(arxiv_qa, 200)\n",
"]\n",
"aqa_test = [\n",
- " dspy.Example(question=example.question, paper_id=example.paper_id, answer=example.answer)\n",
+ " dspy.Example(question=example.question, paper_id=example.paper_id, answer=example.answer).with_inputs(\"question\", \"paper_id\")\n",
" for example in sample(arxiv_qa, 100)\n",
"]"
]
@@ -322,7 +322,7 @@
" tools=tools,\n",
" verbose=False,\n",
" )\n",
- " prediction = avatar(question=example.question)\n",
+ " prediction = avatar(**example.inputs().toDict())\n",
"\n",
" return metric(example, prediction)\n",
" except Exception as e:\n",
@@ -429,7 +429,7 @@
"metadata": {},
"outputs": [],
"source": [
- "teleprompter.multi_thread_executor(aqa_test, optimized_arxiv_agent)"
+ "teleprompter.thread_safe_evaluator(aqa_test, optimized_arxiv_agent)"
]
},
{
@@ -438,7 +438,7 @@
"metadata": {},
"outputs": [],
"source": [
- "teleprompter.multi_thread_executor(sqa_test, optimized_search_agent)"
+ "teleprompter.thread_safe_evaluator(sqa_test, optimized_search_agent)"
]
}
],