diff --git a/llm/default_plugins/__init__.py b/llm/default_plugins/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/llm/openai_models.py b/llm/default_plugins/openai_models.py similarity index 96% rename from llm/openai_models.py rename to llm/default_plugins/openai_models.py index ff14117..6dad52e 100644 --- a/llm/openai_models.py +++ b/llm/default_plugins/openai_models.py @@ -1,6 +1,6 @@ -from . import Model, Prompt, OptionsError, Response, hookimpl -from .errors import NeedsKeyException -from .utils import dicts_to_table_string +from llm import Model, Prompt, OptionsError, Response, hookimpl +from llm.errors import NeedsKeyException +from llm.utils import dicts_to_table_string import click import datetime from typing import Optional diff --git a/llm/vertex_models.py b/llm/default_plugins/vertex_models.py similarity index 93% rename from llm/vertex_models.py rename to llm/default_plugins/vertex_models.py index 61bdb8c..db40400 100644 --- a/llm/vertex_models.py +++ b/llm/default_plugins/vertex_models.py @@ -1,5 +1,5 @@ -from . import Model, Prompt, Response, hookimpl -from .errors import NeedsKeyException +from llm import Model, Prompt, Response, hookimpl +from llm.errors import NeedsKeyException import requests diff --git a/llm/plugins.py b/llm/plugins.py index a2c0090..c36df8a 100644 --- a/llm/plugins.py +++ b/llm/plugins.py @@ -5,7 +5,10 @@ from typing import Dict, List from . import hookspecs from .models import ModelWithAliases, Model -DEFAULT_PLUGINS = ("llm.openai_models", "llm.vertex_models") +DEFAULT_PLUGINS = ( + "llm.default_plugins.openai_models", + "llm.default_plugins.vertex_models", +) pm = pluggy.PluginManager("llm") pm.add_hookspecs(hookspecs)