Skip to content

Commit

Permalink
🧼 isort
Browse files Browse the repository at this point in the history
  • Loading branch information
shroominic committed Dec 15, 2023
1 parent f1ce611 commit cdd6692
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 61 deletions.
9 changes: 6 additions & 3 deletions examples/async/expert_answer.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from asyncio import gather, run as _await
from funcchain import achain, settings
from pydantic import BaseModel
from asyncio import gather
from asyncio import run as _await
from random import shuffle

from pydantic import BaseModel

from funcchain import achain, settings

settings.temperature = 1
settings.llm = "openai/gpt-3.5-turbo-1106"

Expand Down
5 changes: 3 additions & 2 deletions examples/experiments/dynamic_model_generation.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from langchain.document_loaders import WebBaseLoader
from funcchain import chain, settings
from funcchain.parser import CodeBlock
from pydantic import BaseModel
from rich import print

from funcchain import chain, settings
from funcchain.parser import CodeBlock

settings.llm = "gpt-4-1106-preview"
settings.context_lenght = 4096 * 8

Expand Down
9 changes: 1 addition & 8 deletions src/funcchain/_llms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@
from langchain.callbacks.manager import CallbackManagerForLLMRun
from langchain.chat_models.base import BaseChatModel
from langchain.schema import ChatResult
from langchain.schema.messages import (
AIMessage,
AIMessageChunk,
BaseMessage,
ChatMessage,
HumanMessage,
SystemMessage,
)
from langchain.schema.messages import AIMessage, AIMessageChunk, BaseMessage, ChatMessage, HumanMessage, SystemMessage
from langchain.schema.output import ChatGeneration, ChatGenerationChunk
from langchain_core.language_models import BaseLanguageModel
from langchain_core.pydantic_v1 import Field, root_validator
Expand Down
19 changes: 6 additions & 13 deletions src/funcchain/chain/creation.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
from types import UnionType
from typing import TypeVar, Union

from funcchain._llms import ChatLlamaCpp
from langchain.chat_models.base import BaseChatModel
from langchain.prompts import ChatPromptTemplate
from langchain.schema import AIMessage, BaseMessage, BaseOutputParser, HumanMessage
from langchain.schema.chat_history import BaseChatMessageHistory
from langchain.schema.runnable import (
RunnableSequence,
RunnableSerializable,
RunnableWithFallbacks,
)
from langchain.schema.runnable import RunnableSequence, RunnableSerializable, RunnableWithFallbacks
from PIL import Image
from pydantic import BaseModel

from funcchain._llms import ChatLlamaCpp

from ..parser import MultiToolParser, ParserBaseModel, PydanticFuncParser
from ..settings import FuncchainSettings
from ..streaming import stream_handler
Expand All @@ -24,17 +21,13 @@
is_function_model,
is_vision_model,
kwargs_from_parent,
univeral_model_selector,
multi_pydantic_to_functions,
parser_for,
pydantic_to_functions,
pydantic_to_grammar,
univeral_model_selector,
)
from .prompt import (
HumanImageMessagePromptTemplate,
create_chat_prompt,
create_instruction_prompt,
)
from .prompt import HumanImageMessagePromptTemplate, create_chat_prompt, create_instruction_prompt

ChainOutput = TypeVar("ChainOutput")

Expand Down Expand Up @@ -261,7 +254,7 @@ def _gather_llm(
llm = settings.llm
else:
llm = univeral_model_selector(settings)

if not llm:
raise RuntimeError(
"No language model provided. Either set the llm environment variable or "
Expand Down
2 changes: 1 addition & 1 deletion src/funcchain/chain/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from langchain.schema import BaseMessage, BaseOutputParser
from langchain.schema.chat_history import BaseChatMessageHistory

from .invoke import ainvoke, invoke
from ..settings import SettingsOverride, get_settings
from .invoke import ainvoke, invoke

ChainOutput = TypeVar("ChainOutput")

Expand Down
2 changes: 1 addition & 1 deletion src/funcchain/chain/invoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from langchain.schema import BaseMessage, BaseOutputParser
from langchain.schema.chat_history import BaseChatMessageHistory

from ..utils.decorators import get_parent_frame, log_openai_callback, retry_parse
from ..settings import FuncchainSettings
from ..utils.decorators import get_parent_frame, log_openai_callback, retry_parse
from .creation import create_chain

T = TypeVar("T")
Expand Down
11 changes: 4 additions & 7 deletions src/funcchain/chain/prompt.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
from string import Formatter
from typing import Any, Type, Optional
from typing import Any, Optional, Type

from PIL import Image
from pydantic import BaseModel
from langchain.prompts import ChatPromptTemplate
from langchain.prompts.chat import (
BaseStringMessagePromptTemplate,
MessagePromptTemplateT,
)
from langchain.prompts.chat import BaseStringMessagePromptTemplate, MessagePromptTemplateT
from langchain.prompts.prompt import PromptTemplate
from langchain.schema import BaseMessage, HumanMessage, SystemMessage
from langchain.schema.chat_history import BaseChatMessageHistory
from PIL import Image
from pydantic import BaseModel

from ..utils import image_to_base64_url

Expand Down
7 changes: 1 addition & 6 deletions src/funcchain/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
import re
from typing import Callable, Optional, Type, TypeVar

from langchain.schema import (
AIMessage,
ChatGeneration,
Generation,
OutputParserException,
)
from langchain.schema import AIMessage, ChatGeneration, Generation, OutputParserException
from langchain.schema.output_parser import BaseGenerationOutputParser, BaseOutputParser
from pydantic import BaseModel, ValidationError

Expand Down
2 changes: 1 addition & 1 deletion src/funcchain/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from langchain.chat_models.base import BaseChatModel
from langchain.globals import set_llm_cache
from langchain.schema.runnable import RunnableWithFallbacks
from pydantic_settings import BaseSettings
from pydantic import Field
from pydantic_settings import BaseSettings

set_llm_cache(InMemoryCache())

Expand Down
1 change: 1 addition & 0 deletions src/funcchain/streaming.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def stream_to(
... # your chain calls here
"""
import builtins

import rich

if (fn is builtins.print or fn is rich.print) and kwargs == {}:
Expand Down
6 changes: 2 additions & 4 deletions src/funcchain/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
from .decorators import * # noqa: F401, F403
from .function_frame import * # noqa: F401, F403
from .grammars import pydantic_to_grammar # noqa: F401, F403
from .grammars import schema_to_grammar # noqa: F401, F403
from .helpers import * # noqa: F401, F403
from .image import * # noqa: F401, F403
from .model_defaults import * # noqa: F401, F403
from .grammars import (
schema_to_grammar, # noqa: F401, F403
pydantic_to_grammar, # noqa: F401, F403
)
2 changes: 1 addition & 1 deletion src/funcchain/utils/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from langchain.schema.output_parser import OutputParserException
from rich import print

from ..settings import FuncchainSettings
from ..exceptions import ParsingRetryException
from ..settings import FuncchainSettings
from .function_frame import get_parent_frame


Expand Down
1 change: 0 additions & 1 deletion src/funcchain/utils/function_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from ..parser import BoolOutputParser, ParserBaseModel, PydanticOutputParser


FUNC_DEPTH = 8


Expand Down
1 change: 1 addition & 0 deletions src/funcchain/utils/grammars.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import re
from typing import Type

from pydantic import BaseModel

SPACE_RULE = '" "?'
Expand Down
11 changes: 3 additions & 8 deletions src/funcchain/utils/model_defaults.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
from pathlib import Path
from typing import Any

from pathlib import Path
from langchain.chat_models import (
AzureChatOpenAI,
ChatAnthropic,
ChatGooglePalm,
ChatOpenAI,
)
from langchain.chat_models import AzureChatOpenAI, ChatAnthropic, ChatGooglePalm, ChatOpenAI
from langchain.chat_models.base import BaseChatModel

from ..settings import FuncchainSettings
from .._llms import ChatLlamaCpp
from ..settings import FuncchainSettings


def get_gguf_model(
Expand Down
9 changes: 6 additions & 3 deletions tests/async_test.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from asyncio import gather, run as _await
from funcchain import achain, settings
from pydantic import BaseModel
from asyncio import gather
from asyncio import run as _await
from random import shuffle

from pydantic import BaseModel

from funcchain import achain, settings

settings.temperature = 1
settings.llm = "openai/gpt-3.5-turbo-1106"

Expand Down
3 changes: 2 additions & 1 deletion tests/llamacpp_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pytest
from funcchain import chain, settings
from pydantic import BaseModel

from funcchain import chain, settings


class Task(BaseModel):
description: str
Expand Down
3 changes: 2 additions & 1 deletion tests/openai_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from funcchain import chain, settings
from pydantic import BaseModel, Field

from funcchain import chain, settings


class Task(BaseModel):
name: str
Expand Down

0 comments on commit cdd6692

Please sign in to comment.