chore: add redis for getting built plugin #20118
Conversation
dosubot
bot
added
the
size:L
|
@crazywoola CC |
LeeeeeeM
force-pushed
the
chore/add-redis-plugin
branch
2 times, most recently
from
6c1f6af to
81fc4b2
Compare
|
Looks like miss the logic when the new |
LeeeeeeM
force-pushed
the
chore/add-redis-plugin
branch
from
81fc4b2 to
813d156
Compare
done |
crazywoola
requested review from
Yeuoly and
Copilot
and removed request for
Yeuoly
| """ | ||
| Generate the Redis key for caching. | ||
| """ | ||
| return BuiltinToolManageService.REDIS_KEY_PREFIX.format(user_id=user_id, tenant_id=tenant_id) |
There was a problem hiding this comment.
REDIS_KEY_PREFIX is never used again, which could be removed from BuiltinToolManageService. And simply use the string format style to generate cache key instead.
| REDIS_TTL = 60 * 10 # Cache expires in 10 minutes | ||
|
|
||
| @staticmethod | ||
| def get_redis_key(user_id: str, tenant_id: str) -> str: |
There was a problem hiding this comment.
| def get_redis_key(user_id: str, tenant_id: str) -> str: | |
| def generate_cache_key(user_id: str, tenant_id: str) -> str: |
prefer the netual concept cache instead of specific implementation redis.
| redis_key = BuiltinToolManageService.get_redis_key(user_id, tenant_id) | ||
| redis_client.delete(redis_key) |
There was a problem hiding this comment.
Better to squash in a single code line for clearer readibility.
| redis_key = BuiltinToolManageService.get_redis_key(user_id, tenant_id) | ||
| redis_client.delete(redis_key) |
| from models.tools import BuiltinToolProvider | ||
| from services.tools.tools_transform_service import ToolTransformService | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| class BuiltinToolManageService: | ||
| REDIS_KEY_PREFIX = "builtin_tools:user:{user_id}:tenant:{tenant_id}" | ||
| REDIS_TTL = 60 * 10 # Cache expires in 10 minutes |
There was a problem hiding this comment.
Make this configurable in dify_config. And prevent a general config name for this.
| decrypt_credentials=True, | ||
| ) | ||
| # Deserialize cached data directly into a list of dictionaries | ||
| deserialized_data = json.loads(cached_data) |
There was a problem hiding this comment.
Recommend to use ToolProviderApiEntity.model_validate_json() to reach a better performance.
There was a problem hiding this comment.
TypeAdapter(Sequence[ToolProviderApiEntity]) may simplify it.
| # Deserialize cached data directly into a list of dictionaries | ||
| deserialized_data = json.loads(cached_data) | ||
| return [ToolProviderApiEntity(**item) for item in deserialized_data] | ||
| except (json.JSONDecodeError, TypeError) as e: |
There was a problem hiding this comment.
json.JSONDecodeError can be replaced to pydantic.ValidationError if model_validate_json was used.
|
|
||
| return BuiltinToolProviderSort.sort(result) | ||
| # Serialize and store in Redis | ||
| serialized_result = json.dumps([jsonable_encoder(item) for item in result]) |
There was a problem hiding this comment.
pydantic.TypeAdapter(list[Any]).dump_json(result) is a better choice.
Summary
It will cost long time getting all built plugins
Screenshots
in dev mode
Checklist
Important
Please review the checklist below before submitting your pull request.
dev/reformat(backend) andcd web && npx lint-staged(frontend) to appease the lint gods