estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix token expiry miscalculation (#24639)

Browse Source
This commit is contained in:
Yongtao Huang
2025-08-27 18:19:58 +08:00
committed by GitHub
parent 4cd00efe3b
commit bb718acadf
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/extensions/ext_storage.py
View File

@@ -65,7 +65,7 @@ class Storage:
from extensions.storage.volcengine_tos_storage import VolcengineTosStorage from extensions.storage.volcengine_tos_storage import VolcengineTosStorage
return VolcengineTosStorage return VolcengineTosStorage
case StorageType.SUPBASE: case StorageType.SUPABASE:
from extensions.storage.supabase_storage import SupabaseStorage from extensions.storage.supabase_storage import SupabaseStorage
return SupabaseStorage return SupabaseStorage

2
api/extensions/storage/storage_type.py
View File

@@ -14,4 +14,4 @@ class StorageType(StrEnum):
S3 = "s3" S3 = "s3"
TENCENT_COS = "tencent-cos" TENCENT_COS = "tencent-cos"
VOLCENGINE_TOS = "volcengine-tos" VOLCENGINE_TOS = "volcengine-tos"
SUPBASE = "supabase" SUPABASE = "supabase"

4
api/factories/variable_factory.py
View File

@@ -128,10 +128,6 @@ def _build_variable_from_mapping(*, mapping: Mapping[str, Any], selector: Sequen
return cast(Variable, result) return cast(Variable, result)
def infer_segment_type_from_value(value: Any, /) -> SegmentType:
return build_segment(value).value_type
def build_segment(value: Any, /) -> Segment: def build_segment(value: Any, /) -> Segment:
# NOTE: If you have runtime type information available, consider using the `build_segment_with_type` # NOTE: If you have runtime type information available, consider using the `build_segment_with_type`
# below # below

10
api/libs/helper.py
View File

@@ -301,8 +301,8 @@ class TokenManager:
if expiry_minutes is None: if expiry_minutes is None:
raise ValueError(f"Expiry minutes for {token_type} token is not set") raise ValueError(f"Expiry minutes for {token_type} token is not set")
token_key = cls._get_token_key(token, token_type) token_key = cls._get_token_key(token, token_type)
expiry_time = int(expiry_minutes * 60) expiry_seconds = int(expiry_minutes * 60)
redis_client.setex(token_key, expiry_time, json.dumps(token_data)) redis_client.setex(token_key, expiry_seconds, json.dumps(token_data))
if account_id: if account_id:
cls._set_current_token_for_account(account_id, token, token_type, expiry_minutes) cls._set_current_token_for_account(account_id, token, token_type, expiry_minutes)
@@ -336,11 +336,11 @@ class TokenManager:
@classmethod @classmethod
def _set_current_token_for_account( def _set_current_token_for_account(
cls, account_id: str, token: str, token_type: str, expiry_hours: Union[int, float] cls, account_id: str, token: str, token_type: str, expiry_minutes: Union[int, float]
): ):
key = cls._get_account_token_key(account_id, token_type) key = cls._get_account_token_key(account_id, token_type)
expiry_time = int(expiry_hours * 60 * 60) expiry_seconds = int(expiry_minutes * 60)
redis_client.setex(key, expiry_time, token) redis_client.setex(key, expiry_seconds, token)
@classmethod @classmethod
def _get_account_token_key(cls, account_id: str, token_type: str) -> str: def _get_account_token_key(cls, account_id: str, token_type: str) -> str: