mirror of
https://github.com/langgenius/dify.git
synced 2026-01-08 23:34:11 +00:00
Compare commits
5 Commits
feat/knowl
...
fix/versio
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d9c8d76b9 | ||
|
|
9ac6662635 | ||
|
|
316c418a01 | ||
|
|
4886e5ae96 | ||
|
|
7f4a8b955d |
@@ -14,6 +14,7 @@ from controllers.console.wraps import account_initialization_required, enterpris
|
|||||||
from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
|
from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
|
||||||
from core.indexing_runner import IndexingRunner
|
from core.indexing_runner import IndexingRunner
|
||||||
from core.model_runtime.entities.model_entities import ModelType
|
from core.model_runtime.entities.model_entities import ModelType
|
||||||
|
from core.plugin.entities.plugin import ModelProviderID
|
||||||
from core.provider_manager import ProviderManager
|
from core.provider_manager import ProviderManager
|
||||||
from core.rag.datasource.vdb.vector_type import VectorType
|
from core.rag.datasource.vdb.vector_type import VectorType
|
||||||
from core.rag.extractor.entity.extract_setting import ExtractSetting
|
from core.rag.extractor.entity.extract_setting import ExtractSetting
|
||||||
@@ -72,7 +73,9 @@ class DatasetListApi(Resource):
|
|||||||
|
|
||||||
data = marshal(datasets, dataset_detail_fields)
|
data = marshal(datasets, dataset_detail_fields)
|
||||||
for item in data:
|
for item in data:
|
||||||
|
# convert embedding_model_provider to plugin standard format
|
||||||
if item["indexing_technique"] == "high_quality":
|
if item["indexing_technique"] == "high_quality":
|
||||||
|
item["embedding_model_provider"] = str(ModelProviderID(item["embedding_model_provider"]))
|
||||||
item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}"
|
item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}"
|
||||||
if item_model in model_names:
|
if item_model in model_names:
|
||||||
item["embedding_available"] = True
|
item["embedding_available"] = True
|
||||||
|
|||||||
@@ -329,6 +329,7 @@ class BaseAgentRunner(AppRunner):
|
|||||||
)
|
)
|
||||||
if not updated_agent_thought:
|
if not updated_agent_thought:
|
||||||
raise ValueError("agent thought not found")
|
raise ValueError("agent thought not found")
|
||||||
|
agent_thought = updated_agent_thought
|
||||||
|
|
||||||
if thought:
|
if thought:
|
||||||
agent_thought.thought = thought
|
agent_thought.thought = thought
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ class ModelProviderID(GenericProviderID):
|
|||||||
def __init__(self, value: str, is_hardcoded: bool = False) -> None:
|
def __init__(self, value: str, is_hardcoded: bool = False) -> None:
|
||||||
super().__init__(value, is_hardcoded)
|
super().__init__(value, is_hardcoded)
|
||||||
if self.organization == "langgenius" and self.provider_name == "google":
|
if self.organization == "langgenius" and self.provider_name == "google":
|
||||||
self.provider_name = "gemini"
|
self.plugin_name = "gemini"
|
||||||
|
|
||||||
|
|
||||||
class ToolProviderID(GenericProviderID):
|
class ToolProviderID(GenericProviderID):
|
||||||
@@ -181,7 +181,7 @@ class ToolProviderID(GenericProviderID):
|
|||||||
super().__init__(value, is_hardcoded)
|
super().__init__(value, is_hardcoded)
|
||||||
if self.organization == "langgenius":
|
if self.organization == "langgenius":
|
||||||
if self.provider_name in ["jina", "siliconflow"]:
|
if self.provider_name in ["jina", "siliconflow"]:
|
||||||
self.provider_name = f"{self.provider_name}_tool"
|
self.plugin_name = f"{self.provider_name}_tool"
|
||||||
|
|
||||||
|
|
||||||
class PluginDependency(BaseModel):
|
class PluginDependency(BaseModel):
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ from core.model_runtime.entities.provider_entities import (
|
|||||||
ProviderEntity,
|
ProviderEntity,
|
||||||
)
|
)
|
||||||
from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
|
from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
|
||||||
|
from core.plugin.entities.plugin import ModelProviderID
|
||||||
from extensions import ext_hosting_provider
|
from extensions import ext_hosting_provider
|
||||||
from extensions.ext_database import db
|
from extensions.ext_database import db
|
||||||
from extensions.ext_redis import redis_client
|
from extensions.ext_redis import redis_client
|
||||||
@@ -191,7 +192,7 @@ class ProviderManager:
|
|||||||
model_settings=model_settings,
|
model_settings=model_settings,
|
||||||
)
|
)
|
||||||
|
|
||||||
provider_configurations[provider_name] = provider_configuration
|
provider_configurations[str(ModelProviderID(provider_name))] = provider_configuration
|
||||||
|
|
||||||
# Return the encapsulated object
|
# Return the encapsulated object
|
||||||
return provider_configurations
|
return provider_configurations
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ server {
|
|||||||
|
|
||||||
location /e {
|
location /e {
|
||||||
proxy_pass http://plugin_daemon:5002;
|
proxy_pass http://plugin_daemon:5002;
|
||||||
|
proxy_set_header Dify-Hook-Url $scheme://$host$request_uri;
|
||||||
include proxy.conf;
|
include proxy.conf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,10 +112,13 @@ export const AppContextProvider: FC<AppContextProviderProps> = ({ children }) =>
|
|||||||
if (userProfileResponse && !userProfileResponse.bodyUsed) {
|
if (userProfileResponse && !userProfileResponse.bodyUsed) {
|
||||||
const result = await userProfileResponse.json()
|
const result = await userProfileResponse.json()
|
||||||
setUserProfile(result)
|
setUserProfile(result)
|
||||||
const current_version = userProfileResponse.headers.get('x-version')
|
|
||||||
const current_env = process.env.NODE_ENV === 'development' ? 'DEVELOPMENT' : userProfileResponse.headers.get('x-env')
|
if (process.env.NEXT_PUBLIC_SITE_ABOUT !== 'hide' && document?.body?.getAttribute('data-public-site-about') !== 'hide') {
|
||||||
const versionData = await fetchLanggeniusVersion({ url: '/version', params: { current_version } })
|
const current_version = userProfileResponse.headers.get('x-version')
|
||||||
setLangeniusVersionInfo({ ...versionData, current_version, latest_version: versionData.version, current_env })
|
const current_env = process.env.NODE_ENV === 'development' ? 'DEVELOPMENT' : userProfileResponse.headers.get('x-env')
|
||||||
|
const versionData = await fetchLanggeniusVersion({ url: '/version', params: { current_version } })
|
||||||
|
setLangeniusVersionInfo({ ...versionData, current_version, latest_version: versionData.version, current_env })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, [userProfileResponse])
|
}, [userProfileResponse])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user