Files
Maries c6f83a63e1 feat[0.4.2]: Tool OAuth (#179)
* chore: fix ruff issue

* feat(oauth): implement OAuth

* feat(invoke-message): refactor message handling and introduce InvokeMessage class

* feat(plugin-oauth): add credential_id and credential_type to tool parameters

* feat(plugin-oauth): add credential_id and credential_type to tool parameters

* chore: update dify_plugin version to 0.5.0b4 and clean up github.yaml

* chore: update plugin version to 0.1.2 in manifest.yaml

* feat(session): session context and tool backwards invocation credential support

* feat(oauth): session context and tool backwards invocation credential support

* feat: update README and requirements for OAuth support in version 0.4.2

* feat: add .gitignore to exclude IDE files and secret keys

* chore: apply ruff

* feat: bump version to 0.4.2b1

* feat: update GitHub plugin configuration for OAuth support and improve credential handling

* feat: update .gitignore to exclude dify plugin files and public keys

* feat: fix credential validation for GitHub API and bump version to 0.2.1

* feat: update GitHub plugin to support multiple access tokens and bump version to 0.2.5

* chore: apply ruff

* feat: add ToolProviderOAuthError for improved OAuth error handling in GitHub plugin

* chore: apply ruff

* chore: bump version to 0.4.2

* chore: update examples sdk version to 0.4.2

* fix: thread deadlock in PluginRunner when running tests without gevent monkey patching

* feat: add support for refreshing OAuth credentials in Plugin and GitHub provider

* feat: refactor OAuth credential handling to return structured OAuthCredentials object

* apply ruff

* feat: refactor OAuth credential handling to use ToolOAuthCredentials for improved structure

* feat: reorganize imports in __init__.py for improved clarity and structure

* feat: add Microsoft To Do plugin for refresh token example

* chore: apply ruff

* fix: update author in GitHub configuration and clean up Microsoft To Do schema

* chore: bump version to 0.4.2b2 in pyproject.toml

* feat: update Microsoft To Do plugin to handle OAuth token encoding and version bump

* feat:remove inelegant example

* chore: update dify_plugin version to 0.4.2

* chore: bump version to 0.4.2 in pyproject.toml

---------

Co-authored-by: Yeuoly <admin@srmxy.cn>
2025-07-23 13:49:01 +08:00

293 lines
7.5 KiB
Python

import glob
import os
from collections.abc import Sequence
from enum import Enum
from pydantic import BaseModel, ConfigDict, Field, model_validator
from dify_plugin.core.documentation.schema_doc import docs
from dify_plugin.core.utils.yaml_loader import load_yaml_file
from dify_plugin.entities import I18nObject
from dify_plugin.entities.model import AIModelEntity, ModelType
@docs(
description="Configurate method",
name="ModelConfigurateMethod",
)
class ConfigurateMethod(Enum):
"""
Enum class for configurate method of provider model.
"""
PREDEFINED_MODEL = "predefined-model"
CUSTOMIZABLE_MODEL = "customizable-model"
@docs(
description="Model form type",
name="ModelFormType",
)
class FormType(Enum):
"""
Enum class for form type.
"""
TEXT_INPUT = "text-input"
SECRET_INPUT = "secret-input"
SELECT = "select"
RADIO = "radio"
SWITCH = "switch"
@docs(
description="Form show on",
name="ModelFormShowOnObject",
)
class FormShowOnObject(BaseModel):
"""
Model class for form show on.
"""
variable: str
value: str
@docs(
description="Form option",
name="ModelFormOption",
)
class FormOption(BaseModel):
"""
Model class for form option.
"""
label: I18nObject
value: str
show_on: list[FormShowOnObject] = Field(default_factory=list)
def __init__(self, **data):
super().__init__(**data)
if not self.label:
self.label = I18nObject(en_US=self.value)
@docs(
description="Credential form schema",
name="ModelCredentialFormSchema",
)
class CredentialFormSchema(BaseModel):
"""
Model class for credential form schema.
"""
variable: str
label: I18nObject
type: FormType
required: bool = True
default: str | None = None
options: list[FormOption] | None = None
placeholder: I18nObject | None = None
max_length: int = 0
show_on: list[FormShowOnObject] = Field(default_factory=list)
@docs(
description="Model provider credential schema",
name="ModelProviderCredentialSchema",
)
class ProviderCredentialSchema(BaseModel):
"""
Model class for provider credential schema.
"""
credential_form_schemas: list[CredentialFormSchema]
@docs(
description="Field model schema",
name="ModelFieldModelSchema",
)
class FieldModelSchema(BaseModel):
label: I18nObject
placeholder: I18nObject | None = None
class ModelCredentialSchema(BaseModel):
"""
Model class for model credential schema.
"""
model: FieldModelSchema
credential_form_schemas: list[CredentialFormSchema]
class SimpleProviderEntity(BaseModel):
"""
Simple model class for provider.
"""
provider: str
label: I18nObject
icon_small: I18nObject | None = None
icon_large: I18nObject | None = None
icon_small_dark: I18nObject | None = None
icon_large_dark: I18nObject | None = None
supported_model_types: Sequence[ModelType]
models: list[AIModelEntity] = []
@docs(
description="Model provider help",
name="ModelProviderHelp",
)
class ProviderHelpEntity(BaseModel):
"""
Model class for provider help.
"""
title: I18nObject
url: I18nObject
@docs(
description="Model position",
name="ModelPosition",
)
class ModelPosition(BaseModel):
"""
Model class for ai models
"""
llm: list[str] | None = Field(
default_factory=list, description="Sorts of llm model in ascending order, fill model name here"
)
text_embedding: list[str] | None = Field(
default_factory=list, description="Sorts of text embedding model in ascending order, fill model name here"
)
rerank: list[str] | None = Field(
default_factory=list, description="Sorts of rerank model in ascending order, fill model name here"
)
tts: list[str] | None = Field(
default_factory=list, description="Sorts of tts model in ascending order, fill model name here"
)
speech2text: list[str] | None = Field(
default_factory=list, description="Sorts of speech2text model in ascending order, fill model name here"
)
moderation: list[str] | None = Field(
default_factory=list, description="Sorts of moderation model in ascending order, fill model name here"
)
class ProviderEntity(BaseModel):
"""
Model class for provider.
"""
provider: str
label: I18nObject
description: I18nObject | None = None
icon_small: I18nObject | None = None
icon_large: I18nObject | None = None
background: str | None = None
help: ProviderHelpEntity | None = None
supported_model_types: Sequence[ModelType]
configurate_methods: list[ConfigurateMethod]
models: list[AIModelEntity] = Field(default_factory=list)
provider_credential_schema: ProviderCredentialSchema | None = None
model_credential_schema: ModelCredentialSchema | None = None
position: ModelPosition | None = None
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
def to_simple_provider(self) -> SimpleProviderEntity:
"""
Convert to simple provider.
:return: simple provider
"""
return SimpleProviderEntity(
provider=self.provider,
label=self.label,
icon_small=self.icon_small,
icon_large=self.icon_large,
supported_model_types=self.supported_model_types,
models=self.models,
)
@model_validator(mode="before")
@classmethod
def validate_models(cls, values) -> dict:
value = values.get("models", {})
if not isinstance(value, dict):
raise ValueError("models should be a glob path list")
cwd = os.getcwd()
model_entities = []
def load_models(model_type: str):
if model_type not in value:
return
for path in value[model_type].get("predefined", []):
yaml_paths = glob.glob(os.path.join(cwd, path))
for yaml_path in yaml_paths:
if yaml_path.endswith("_position.yaml"):
if "position" not in values:
values["position"] = {}
position = load_yaml_file(yaml_path)
values["position"][model_type] = position
else:
model_entity = load_yaml_file(yaml_path)
if not model_entity:
raise ValueError(f"Error loading model entity: {yaml_path}")
provider_model = AIModelEntity(**model_entity)
model_entities.append(provider_model)
load_models("llm")
load_models("text_embedding")
load_models("rerank")
load_models("tts")
load_models("speech2text")
load_models("moderation")
values["models"] = model_entities
return values
@docs(
description="Model provider configuration extra",
name="ModelProviderExtra",
)
class ModelProviderConfigurationExtra(BaseModel):
class Python(BaseModel):
provider_source: str
model_sources: list[str] = Field(default_factory=list)
model_config = ConfigDict(protected_namespaces=())
python: Python
@docs(
name="ModelProvider",
description="Model provider configuration",
outside_reference_fields={"models": AIModelEntity},
)
class ModelProviderConfiguration(ProviderEntity):
extra: ModelProviderConfigurationExtra
# class ProviderConfig(BaseModel):
# """
# Model class for provider config.
# """
# provider: str
# credentials: dict