Skip to content

Commit 131e4b0

Browse files
Josephrptonic
and
tonic
authored
major refactor (#74)
need to fix import statements Co-authored-by: tonic <[email protected]>
1 parent 02bbfb5 commit 131e4b0

37 files changed

+43
-1770
lines changed

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,22 @@ setx SQLITE_INC "C:\sqlite"
259259
```
260260
proceed with the rest of the setup below.
261261

262+
### Install Taskweaver
263+
264+
TaskWeaver requires Python >= 3.10. It can be installed by running the following command:
265+
266+
```
267+
# [optional to create conda environment]
268+
# conda create -n taskweaver python=3.10
269+
# conda activate taskweaver
270+
271+
# clone the repository
272+
git clone https://github.com/microsoft/TaskWeaver.git
273+
cd TaskWeaver
274+
# install the requirements
275+
pip install -r requirements.txt
276+
```
277+
262278
**Command Prompt**:
263279
download and install wsl:
264280
```bash

main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import os
88
import asyncio
99
import streamlit as st
10-
from src.semantic_kernel.semantic_kernel_module import SemanticKernelDataModule
11-
from src.tonicweaver.taskweaver_module import TaskWeaverDataProcessor
12-
from src.autogen.autogen_module import AutoGenModule
10+
from src.module.semantic_kernel_module import SemanticKernelDataModule
11+
from src.module.taskweaver_module import TaskWeaverDataProcessor
12+
from src.module.autogen_module import AutoGenModule
1313

1414
def process_image(image, project_id, region, access_token):
1515
buffered = io.BytesIO()

requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ azure-core
88
azure-search-documents
99
pyautogen[gemini]~=0.2.0b4
1010
semantic-kernel
11+
langchain
12+
tabulate
1113
msrest
1214
msrestazure
15+
pymemgpt
1316
bs4
1417
python-dotenv
1518
aiohttp>=3.9.0,<3.9.1
1619
beautifulsoup4==4.12.2
1720
chromadb==0.4.20
1821
llama_hub==0.0.59
1922
llama_index==0.9.15.post2
20-
pysqlite3
2123
streamlit
2224
streamlit-mic-recorder

src/.chainlit/config.toml

Lines changed: 0 additions & 84 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/autogen/autogen_module.py renamed to src/module/autogen_module.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
from typing import List, Dict, Any, Optional
33
from pathlib import Path
4-
from semantic_kernel.semantic_kernel_module import SemanticKernelModule
5-
from tonicweaver.taskweaver_module import TaskWeaverDataProcessor
6-
from agent_builder import AgentBuilder
4+
from src.module.semantic_kernel_module import SemanticKernelModule
5+
from src.module.taskweaver_module import TaskWeaverDataProcessor
6+
from src.module.agent_builder import AgentBuilder
77
from autogen.agentchat.contrib.retrieve_assistant_agent import RetrieveAssistantAgent
88
from autogen.agentchat.contrib.retrieve_user_proxy_agent import RetrieveUserProxyAgent
99
from autogen import AssistantAgent, UserProxyAgent, config_list_from_json

src/semantic_kernel/semantic_kernel_module.py renamed to src/module/semantic_kernel_module.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from semantic_kernel import SemanticKernel, KernelBuilder
2-
import taskweaver
1+
import semantic_kernel
2+
from semantic_kernel import Kernel
33
from taskweaver.app.app import TaskWeaverApp
4-
from semantic_kernel.plugins.taskweaverplugin import TaskWeaverSQLIntegration
5-
from semantic_kernel.plugins.googleconnector import GoogleConnector
6-
from semantic_kernel.plugins.sk_web_pages_plugin import WebPagesPlugin
4+
from plugins.taskweaverplugin import TaskWeaverSQLIntegration
5+
from plugins.googleconnector import GoogleConnector
6+
from plugins.sk_web_pages_plugin import WebPagesPlugin
77
import asyncio
88

99
project_details = {
@@ -98,13 +98,13 @@ def __init__(self, google_api_key, google_search_engine_id, taskweaver_app_dir):
9898
self.kernel.Plugins.RegisterPlugin('google', self.google_connector)
9999
self.kernel.Plugins.RegisterPlugin('web_pages', self.web_pages_plugin)
100100

101-
async def process_data_with_taskweaver(self, task_description):
102-
# Process data using TaskWeaver library
103-
response_round = self.taskweaver_session.send_message(
104-
task_description,
105-
event_handler=lambda _type, _msg: print(f"{_type}:\n{_msg}")
106-
)
107-
return response_round.to_dict()
101+
# async def process_data_with_taskweaver(self, task_description):
102+
# # Process data using TaskWeaver library
103+
# response_round = self.taskweaver_session.send_message(
104+
# task_description,
105+
# event_handler=lambda _type, _msg: print(f"{_type}:\n{_msg}")
106+
# )
107+
# return response_round.to_dict()
108108

109109
async def process_data_with_taskweaver(self, task_description):
110110
taskweaver_processor = self.semantic_kernel.get_plugin('taskweaver')
@@ -129,7 +129,6 @@ async def fetch_and_process_web_pages(self, query, num_results=10, offset=0):
129129
processed_content = self.taskweaver_processor.process_data_task({'content': content})
130130
page_contents.append(processed_content)
131131
return page_contents
132-
133132

134133
async def create_and_fetch_sow(self, project_details):
135134
sow_planner = SoWPlanner(self.taskweaver_integration)

src/tonicweaver/taskweaver_module.py renamed to src/module/taskweaver_module.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import taskweaver
2-
from taskweaver import TaskWeaver
3-
from planner.planner import Planner
4-
from code_generator.code_generator import CodeGenerator
5-
from code_interpretor.code_interpreter import CodeInterpreter
2+
from taskweaver import TaskWeaverApp
3+
from src.planner.planner import Planner
4+
from taskweaver.code_generator.code_generator import CodeGenerator
5+
from taskweaver.code_interpretor.code_interpreter import CodeInterpreter
66
from taskweaver.logging import TelemetryLogger
77
from taskweaver.memory import Memory
88

File renamed without changes.
File renamed without changes.

src/plugins/__init__.py

Whitespace-only changes.

src/semantic_kernel/plugins/taskweaverplugin.py renamed to src/plugins/taskweaverplugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sqlite3
22
import taskweaver
3-
from src.tonicweaver.taskweaver_module import TaskWeaverDataProcessor
3+
from src.module.taskweaver_module import TaskWeaverDataProcessor
44
from taskweaver.app.app import TaskWeaverApp
55

66
# Setup TaskWeaver
7-
app_dir = "./src/taskweaver/" # Path to the directory with taskweaver_config.json
7+
app_dir = "./src/config/" # Path to the directory with taskweaver_config.json
88
app = TaskWeaverApp(app_dir=app_dir)
99
session = app.get_session()
1010

0 commit comments

Comments
 (0)