Skip to content

Commit

Permalink
Merge branch 'main' into update-modelid
Browse files Browse the repository at this point in the history
  • Loading branch information
SandraAhlgrimm authored Jan 26, 2024
2 parents f7f1664 + 5953beb commit e582951
Show file tree
Hide file tree
Showing 144 changed files with 2,723 additions and 2,751 deletions.
8 changes: 8 additions & 0 deletions python/DEV_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@ You can also run all the tests together under the [tests](tests/) folder.

## Tools and scripts

## Implementation Decisions

### Asynchronous programming

It's important to note that most of this library is written with asynchronous in mind. The
developer should always assume everything is asynchronous. One can use the function signature
with either `async def` or `def` to understand if something is asynchronous or not.

## Pydantic and Serialization

[Pydantic Documentation](https://docs.pydantic.dev/1.10/)
Expand Down
2 changes: 1 addition & 1 deletion python/notebooks/00-getting-started.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion python/notebooks/01-basic-loading-the-kernel.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion python/notebooks/02-running-prompts-from-file.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion python/notebooks/03-semantic-function-inline.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion python/notebooks/04-context-variables-chat.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
Expand Down
30 changes: 15 additions & 15 deletions python/notebooks/05-using-the-planner.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"metadata": {},
"outputs": [],
"source": [
"!python -m pip install semantic-kernel==0.4.6.dev0"
"!python -m pip install semantic-kernel==0.4.7.dev0"
]
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"id": "11e59885",
"metadata": {},
"outputs": [],
Expand All @@ -41,7 +41,7 @@
"\n",
"kernel = sk.Kernel()\n",
"\n",
"useAzureOpenAI = False\n",
"useAzureOpenAI = True\n",
"\n",
"# Configure AI backend used by the kernel\n",
"if useAzureOpenAI:\n",
Expand All @@ -68,7 +68,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"id": "93bc6103",
"metadata": {},
"outputs": [],
Expand All @@ -92,7 +92,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"id": "ca0e7604",
"metadata": {},
"outputs": [],
Expand Down Expand Up @@ -131,7 +131,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"id": "20d35ed0",
"metadata": {},
"outputs": [],
Expand All @@ -143,12 +143,12 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"id": "d5697c09",
"metadata": {},
"outputs": [],
"source": [
"basic_plan = await planner.create_plan_async(ask, kernel)"
"basic_plan = await planner.create_plan(ask, kernel)"
]
},
{
Expand Down Expand Up @@ -220,7 +220,7 @@
"She likes Shakespeare so write using his style. She speaks French so write it in French.\n",
"Convert the text to uppercase.\"\"\"\n",
"\n",
"new_plan = await planner.create_plan_async(ask, kernel)"
"new_plan = await planner.create_plan(ask, kernel)"
]
},
{
Expand Down Expand Up @@ -256,7 +256,7 @@
"metadata": {},
"outputs": [],
"source": [
"results = await planner.execute_plan_async(new_plan, kernel)"
"results = await planner.execute_plan(new_plan, kernel)"
]
},
{
Expand Down Expand Up @@ -322,7 +322,7 @@
"metadata": {},
"outputs": [],
"source": [
"sequential_plan = await planner.create_plan_async(goal=ask)"
"sequential_plan = await planner.create_plan(goal=ask)"
]
},
{
Expand Down Expand Up @@ -445,7 +445,7 @@
"metadata": {},
"outputs": [],
"source": [
"plan = await planner.create_plan_async(goal=ask)"
"plan = await planner.create_plan(goal=ask)"
]
},
{
Expand Down Expand Up @@ -537,9 +537,9 @@
" name=\"query\",\n",
" description=\"The search query\",\n",
" )\n",
" async def search_async(self, query: str, context: KernelContext) -> str:\n",
" async def search(self, query: str, context: KernelContext) -> str:\n",
" query = query or context.variables.get(\"query\")[1]\n",
" result = await self._connector.search_async(query, num_results=5, offset=0)\n",
" result = await self._connector.search(query, num_results=5, offset=0)\n",
" return str(result)"
]
},
Expand Down Expand Up @@ -669,7 +669,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.12"
"version": "3.9.13"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit e582951

Please sign in to comment.