Skip to content

Commit

Permalink
Format import according to isort
Browse files Browse the repository at this point in the history
  • Loading branch information
send18 committed Jul 22, 2023
1 parent b72b6ad commit 0722257
Show file tree
Hide file tree
Showing 88 changed files with 225 additions and 152 deletions.
4 changes: 2 additions & 2 deletions examples/llm_hello_world.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"""
import asyncio

from metagpt.llm import LLM, Claude
from metagpt.logs import logger
from metagpt.llm import LLM
from metagpt.llm import Claude


async def main():
llm = LLM()
Expand Down
1 change: 1 addition & 0 deletions examples/search_google.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"""

import asyncio

from metagpt.config import Config
from metagpt.roles import Searcher

Expand Down
3 changes: 2 additions & 1 deletion examples/search_kb.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
@File : search_kb.py
"""
import asyncio

from metagpt.const import DATA_PATH
from metagpt.document_store import FaissStore
from metagpt.roles import Sales
from metagpt.logs import logger
from metagpt.roles import Sales


async def search():
Expand Down
2 changes: 2 additions & 0 deletions examples/search_with_specific_engine.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import asyncio

from metagpt.config import Config
from metagpt.roles import Searcher
from metagpt.tools import SearchEngineType


async def main():
# Serper API
await Searcher(engine = SearchEngineType.SERPER_GOOGLE).run("What are some good sun protection products?")
Expand Down
15 changes: 7 additions & 8 deletions metagpt/actions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,19 @@

from metagpt.actions.action import Action
from metagpt.actions.action_output import ActionOutput

from metagpt.actions.write_prd import WritePRD
from metagpt.actions.write_prd_review import WritePRDReview
from metagpt.actions.add_requirement import BossRequirement
from metagpt.actions.debug_error import DebugError
from metagpt.actions.design_api import WriteDesign
from metagpt.actions.design_api_review import DesignReview
from metagpt.actions.design_filenames import DesignFilenames
from metagpt.actions.project_management import AssignTasks, WriteTasks
from metagpt.actions.run_code import RunCode
from metagpt.actions.search_and_summarize import SearchAndSummarize
from metagpt.actions.write_code import WriteCode
from metagpt.actions.write_code_review import WriteCodeReview
from metagpt.actions.write_prd import WritePRD
from metagpt.actions.write_prd_review import WritePRDReview
from metagpt.actions.write_test import WriteTest
from metagpt.actions.run_code import RunCode
from metagpt.actions.debug_error import DebugError
from metagpt.actions.project_management import WriteTasks, AssignTasks
from metagpt.actions.add_requirement import BossRequirement
from metagpt.actions.search_and_summarize import SearchAndSummarize


class ActionType(Enum):
Expand Down
9 changes: 5 additions & 4 deletions metagpt/actions/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
@Author : alexanderwu
@File : action.py
"""
from typing import Optional
from abc import ABC
from typing import Optional

from metagpt.llm import LLM
from metagpt.actions.action_output import ActionOutput
from tenacity import retry, stop_after_attempt, wait_fixed
from pydantic import BaseModel
from tenacity import retry, stop_after_attempt, wait_fixed

from metagpt.actions.action_output import ActionOutput
from metagpt.llm import LLM
from metagpt.utils.common import OutputParser


Expand Down
3 changes: 2 additions & 1 deletion metagpt/actions/action_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
@File : action_output
"""

from pydantic import create_model, validator, root_validator, BaseModel
from typing import Dict, Type

from pydantic import BaseModel, create_model, root_validator, validator


class ActionOutput:
content: str
Expand Down
1 change: 0 additions & 1 deletion metagpt/actions/analyze_dep_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

from metagpt.actions import Action


PROMPT = """You are an AI developer, trying to write a program that generates code for users based on their intentions.
For the user's prompt:
Expand Down
3 changes: 2 additions & 1 deletion metagpt/actions/azure_tts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
@Author : Leo Xiao
@File : azure_tts.py
"""
from azure.cognitiveservices.speech import AudioConfig, SpeechConfig, SpeechSynthesizer

from metagpt.actions.action import Action
from azure.cognitiveservices.speech import SpeechConfig, SpeechSynthesizer, AudioConfig
from metagpt.config import Config


Expand Down
7 changes: 3 additions & 4 deletions metagpt/actions/design_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
from pathlib import Path
from typing import List, Tuple

from metagpt.actions import ActionOutput
from metagpt.actions import Action
from metagpt.actions import Action, ActionOutput
from metagpt.const import WORKSPACE_ROOT
from metagpt.utils.common import CodeParser
from metagpt.schema import Message
from metagpt.logs import logger
from metagpt.schema import Message
from metagpt.utils.common import CodeParser
from metagpt.utils.mermaid import mermaid_to_file

PROMPT_TEMPLATE = """
Expand Down
3 changes: 1 addition & 2 deletions metagpt/actions/design_filenames.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
@Author : alexanderwu
@File : design_filenames.py
"""
from metagpt.logs import logger
from metagpt.actions import Action

from metagpt.logs import logger

PROMPT = """You are an AI developer, trying to write a program that generates code for users based on their intentions.
When given their intentions, provide a complete and exhaustive list of file paths needed to write the program for the user.
Expand Down
5 changes: 3 additions & 2 deletions metagpt/actions/project_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
"""
from typing import List, Tuple

from tenacity import retry, stop_after_attempt, wait_fixed

from metagpt.actions.action import Action
from metagpt.actions.action_output import ActionOutput
from metagpt.const import WORKSPACE_ROOT
from metagpt.logs import logger
from metagpt.utils.common import OutputParser, CodeParser
from tenacity import retry, stop_after_attempt, wait_fixed
from metagpt.utils.common import CodeParser, OutputParser

PROMPT_TEMPLATE = '''
# Context
Expand Down
5 changes: 2 additions & 3 deletions metagpt/actions/search_and_summarize.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@
"""
import asyncio

from metagpt.logs import logger
from metagpt.config import SearchEngineType, Config
from metagpt.actions import Action
from metagpt.config import Config, SearchEngineType
from metagpt.logs import logger
from metagpt.schema import Message
from metagpt.tools.search_engine import SearchEngine


SEARCH_AND_SUMMARIZE_SYSTEM = """### Requirements
1. Please summarize the latest dialogue based on the reference information (secondary) and dialogue history (primary). Do not include text that is irrelevant to the conversation.
- The context is for reference only. If it is irrelevant to the user's search request history, please reduce its reference and usage.
Expand Down
11 changes: 8 additions & 3 deletions metagpt/actions/write_prd.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
@Author : alexanderwu
@File : write_prd.py
"""
from typing import List, Tuple

from metagpt.actions import Action, ActionOutput
from metagpt.actions.search_and_summarize import SEARCH_AND_SUMMARIZE_SYSTEM, SearchAndSummarize, \
SEARCH_AND_SUMMARIZE_PROMPT, SEARCH_AND_SUMMARIZE_SYSTEM_EN_US
from metagpt.actions.search_and_summarize import (
SEARCH_AND_SUMMARIZE_PROMPT,
SEARCH_AND_SUMMARIZE_SYSTEM,
SEARCH_AND_SUMMARIZE_SYSTEM_EN_US,
SearchAndSummarize,
)
from metagpt.logs import logger
from typing import List, Tuple

PROMPT_TEMPLATE = """
# Context
Expand Down
5 changes: 2 additions & 3 deletions metagpt/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@

import yaml

from metagpt.logs import logger

from metagpt.const import PROJECT_ROOT
from metagpt.utils.singleton import Singleton
from metagpt.logs import logger
from metagpt.tools import SearchEngineType
from metagpt.utils.singleton import Singleton


class NotConfiguredException(Exception):
Expand Down
2 changes: 1 addition & 1 deletion metagpt/document_store/chromadb_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
@Author : alexanderwu
@File : chromadb_store.py
"""
from sentence_transformers import SentenceTransformer
import chromadb
from sentence_transformers import SentenceTransformer


class ChromaStore:
Expand Down
10 changes: 6 additions & 4 deletions metagpt/document_store/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@

import numpy as np
import pandas as pd
from tqdm import tqdm

from langchain.document_loaders import UnstructuredWordDocumentLoader, UnstructuredPDFLoader
from langchain.document_loaders import TextLoader
from langchain.document_loaders import (
TextLoader,
UnstructuredPDFLoader,
UnstructuredWordDocumentLoader,
)
from langchain.text_splitter import CharacterTextSplitter
from tqdm import tqdm


def validate_cols(content_col: str, df: pd.DataFrame):
Expand Down
12 changes: 6 additions & 6 deletions metagpt/document_store/faiss_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
@Author : alexanderwu
@File : faiss_store.py
"""
from typing import Optional
from pathlib import Path
import pickle
from pathlib import Path
from typing import Optional

import faiss
from langchain.vectorstores import FAISS
from langchain.embeddings import OpenAIEmbeddings
import pandas as pd
from langchain.embeddings import OpenAIEmbeddings
from langchain.vectorstores import FAISS
from tqdm import tqdm

from metagpt.logs import logger
from metagpt.const import DATA_PATH
from metagpt.document_store.document import Document
from metagpt.document_store.base_store import LocalStore
from metagpt.document_store.document import Document
from metagpt.logs import logger


class FaissStore(LocalStore):
Expand Down
5 changes: 3 additions & 2 deletions metagpt/document_store/milvus_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
@File : milvus_store.py
"""
from typing import TypedDict

import numpy as np
from pymilvus import connections, Collection, CollectionSchema, FieldSchema, DataType
from metagpt.document_store.base_store import BaseStore
from pymilvus import Collection, CollectionSchema, DataType, FieldSchema, connections

from metagpt.document_store.base_store import BaseStore

type_mapping = {
int: DataType.INT64,
Expand Down
12 changes: 2 additions & 10 deletions metagpt/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,13 @@
@File : environment.py
"""
import asyncio

from typing import Iterable

from pydantic import (
BaseModel,
BaseSettings,
PyObject,
RedisDsn,
PostgresDsn,
Field,
)
from pydantic import BaseModel, BaseSettings, Field, PostgresDsn, PyObject, RedisDsn

from metagpt.memory import Memory
from metagpt.roles import Role
from metagpt.schema import Message
from metagpt.memory import Memory


class Environment(BaseModel):
Expand Down
1 change: 1 addition & 0 deletions metagpt/inspect_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"""

import inspect

import metagpt # replace with your module


Expand Down
2 changes: 1 addition & 1 deletion metagpt/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@File : llm.py
"""

from metagpt.provider.openai_api import OpenAIGPTAPI as LLM
from metagpt.provider.anthropic_api import Claude2 as Claude
from metagpt.provider.openai_api import OpenAIGPTAPI as LLM

DEFAULT_LLM = LLM()
CLAUDE_LLM = Claude()
Expand Down
2 changes: 2 additions & 0 deletions metagpt/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"""

import sys

from loguru import logger as _logger

from metagpt.const import PROJECT_ROOT


Expand Down
7 changes: 3 additions & 4 deletions metagpt/management/skill_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
@File : skill_manager.py
"""
from sentence_transformers import SentenceTransformer
from metagpt.logs import logger

from metagpt.const import PROMPT_PATH
from metagpt.llm import LLM
from metagpt.actions import Action
from metagpt.const import PROMPT_PATH
from metagpt.document_store.chromadb_store import ChromaStore

from metagpt.llm import LLM
from metagpt.logs import logger

Skill = Action

Expand Down
2 changes: 1 addition & 1 deletion metagpt/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
@Author : alexanderwu
@File : manager.py
"""
from metagpt.logs import logger
from metagpt.llm import LLM
from metagpt.logs import logger
from metagpt.schema import Message


Expand Down
3 changes: 3 additions & 0 deletions metagpt/provider/anthropic_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
"""

import asyncio

import anthropic
from anthropic import Anthropic

from metagpt.config import CONFIG


class Claude2:
def ask(self, prompt):
client = Anthropic(api_key=CONFIG.claude_api_key)
Expand Down
4 changes: 2 additions & 2 deletions metagpt/provider/base_gpt_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
@Author : alexanderwu
@File : base_gpt_api.py
"""
from abc import abstractmethod
from typing import Optional

from abc import abstractmethod
from metagpt.provider.base_chatbot import BaseChatbot
from metagpt.logs import logger
from metagpt.provider.base_chatbot import BaseChatbot


class BaseGPTAPI(BaseChatbot):
Expand Down
Loading

0 comments on commit 0722257

Please sign in to comment.