Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ez] Export missing default model parsers #1112

Merged
merged 1 commit into from
Feb 3, 2024
Merged

[ez] Export missing default model parsers #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions python/src/aiconfig/Config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
import json
import os
from typing import Any, Dict, List, Literal, Optional, Tuple
from aiconfig.default_parsers.claude import ClaudeBedrockModelParser

import json
import os
import requests
import yaml
from aiconfig.callback import CallbackEvent, CallbackManager
from aiconfig.default_parsers.anyscale_endpoint import (

from .callback import CallbackEvent, CallbackManager
from .default_parsers.anyscale_endpoint import (
DefaultAnyscaleEndpointParser,
)
from aiconfig.default_parsers.openai import DefaultOpenAIParser
from aiconfig.default_parsers.gemini import GeminiModelParser
from aiconfig.default_parsers.palm import PaLMChatParser, PaLMTextParser
from aiconfig.model_parser import InferenceOptions, ModelParser

from aiconfig.schema import JSONObject

from .default_parsers.claude import ClaudeBedrockModelParser
from .default_parsers.dalle import DalleImageGenerationParser
from .default_parsers.openai import DefaultOpenAIParser
from .default_parsers.gemini import GeminiModelParser
from .default_parsers.hf import HuggingFaceTextGenerationParser
from .default_parsers.palm import PaLMChatParser, PaLMTextParser
from .model_parser import InferenceOptions, ModelParser

from .registry import (
ModelParserRegistry,
update_model_parser_registry_with_config_runtime,
)
from .schema import AIConfig, Prompt
from .schema import AIConfig, JSONObject, Prompt
from .util.config_utils import is_yaml_ext

gpt_models_main = [
Expand Down Expand Up @@ -53,13 +52,13 @@
ModelParserRegistry.register_model_parser(
DefaultAnyscaleEndpointParser("AnyscaleEndpoint")
)
ModelParserRegistry.register_model_parser(ClaudeBedrockModelParser())
for model in gpt_models_extra:
ModelParserRegistry.register_model_parser(DefaultOpenAIParser(model))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, would be better to have this colocate with the main registered ones above. Do you know why these are handled in a separate 'extra' array?

Copy link
Member

@Ankush-lastmile Ankush-lastmile Feb 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was implemented in #994 as a quick hack

ModelParserRegistry.register_model_parser(
GeminiModelParser("gemini-pro"), ["gemini-pro"]
)
ModelParserRegistry.register_model_parser(ClaudeBedrockModelParser())
ModelParserRegistry.register_model_parser(HuggingFaceTextGenerationParser())
for model in gpt_models_extra:
rossdanlm marked this conversation as resolved.
Show resolved Hide resolved
ModelParserRegistry.register_model_parser(DefaultOpenAIParser(model))
ModelParserRegistry.register_model_parser(PaLMChatParser())
ModelParserRegistry.register_model_parser(PaLMTextParser())

Expand Down
9 changes: 7 additions & 2 deletions python/src/aiconfig/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@

# The AIConfigRuntime class. This is the main class that you will use to run your AIConfig.
from .Config import AIConfigRuntime
from .default_parsers.openai import DefaultOpenAIParser, OpenAIInference
from .default_parsers.azure import AzureOpenAIParser


# Model Parsers
from .default_parsers.anyscale_endpoint import DefaultAnyscaleEndpointParser
from .default_parsers.azure import AzureOpenAIParser
from .default_parsers.claude import ClaudeBedrockModelParser
from .default_parsers.dalle import DalleImageGenerationParser
from .default_parsers.gemini import GeminiModelParser
from .default_parsers.openai import DefaultOpenAIParser, OpenAIInference
from .default_parsers.palm import PaLMChatParser, PaLMTextParser
from .default_parsers.parameterized_model_parser import (
ParameterizedModelParser,
Expand Down
Loading