opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 10:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace Any with [T] syntax (#35750)

Browse Source 
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
This commit is contained in:
aliworksx08 2026-04-30 04:08:29 -10:00 committed by GitHub
parent 574d5865f4
commit 87add9a4f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
scripts/stress-test/common/config_helper.py
View File

@ -2,7 +2,43 @@
import json
from pathlib import Path
from typing import Any
from typing import NotRequired, TypedDict
class AdminConfig(TypedDict):
"""Configuration for admin section."""
username: str
password: str
base_url: str
class AuthConfig(TypedDict):
"""Configuration for authentication section."""
access_token: str
refresh_token: NotRequired[str]
expires_at: NotRequired[int]
class AppConfig(TypedDict):
"""Configuration for app section."""
app_id: str
app_name: NotRequired[str]
description: NotRequired[str]
class ApiKeyConfig(TypedDict):
"""Configuration for API key section."""
token: str
key_name: NotRequired[str]
expires_at: NotRequired[int]
class StressTestState(TypedDict):
"""Complete stress test state structure."""
admin: NotRequired[AdminConfig]
auth: NotRequired[AuthConfig]
app: NotRequired[AppConfig]
api_key: NotRequired[ApiKeyConfig]
class ConfigHelper:
@ -44,8 +80,8 @@ class ConfigHelper:
filename += ".json"
return self.base_dir / filename
def read_config(self, filename: str) -> dict[str, Any] | None:
"""Read a configuration file.
def read_config[T](self, filename: str) -> T | None:
"""Read a configuration file with generic return type.
DEPRECATED: Use read_state() or get_state_section() for new code.
This method provides backward compatibility.
@ -54,11 +90,12 @@ class ConfigHelper:
filename: Name of the config file to read
Returns:
Dictionary containing config data, or None if file doesn't exist
Configuration data of type T, or None if file doesn't exist
"""
# Provide backward compatibility for old config names
if filename in self._LEGACY_SECTION_MAP:
return self.get_state_section(self._LEGACY_SECTION_MAP[filename])
section_data = self.get_state_section(self._LEGACY_SECTION_MAP[filename])
return section_data # type: ignore
config_path = self.get_config_path(filename)
@ -67,12 +104,12 @@ class ConfigHelper:
try:
with open(config_path) as f:
return json.load(f)
return json.load(f) # type: ignore
except (OSError, json.JSONDecodeError) as e:
print(f"❌ Error reading {filename}: {e}")
return None
def write_config(self, filename: str, data: dict[str, Any]) -> bool:
def write_config[T](self, filename: str, data: T) -> bool:
"""Write data to a configuration file.
DEPRECATED: Use write_state() or update_state_section() for new code.
@ -80,7 +117,7 @@ class ConfigHelper:
Args:
filename: Name of the config file to write
data: Dictionary containing data to save
data: Data to save (must be JSON serializable)
Returns:
True if successful, False otherwise
@ -89,7 +126,7 @@ class ConfigHelper:
if filename in self._LEGACY_SECTION_MAP:
return self.update_state_section(
self._LEGACY_SECTION_MAP[filename],
data,
data, # type: ignore
)
self.ensure_config_dir()
@ -97,7 +134,7 @@ class ConfigHelper:
try:
with open(config_path, "w") as f:
json.dump(data, f, indent=2)
json.dump(data, f, indent=2) # type: ignore
return True
except OSError as e:
print(f"❌ Error writing {filename}: {e}")
@ -135,7 +172,7 @@ class ConfigHelper:
print(f"❌ Error deleting {filename}: {e}")
return False
def read_state(self) -> dict[str, Any] | None:
def read_state(self) -> StressTestState | None:
"""Read the entire stress test state.
Returns:
@ -147,12 +184,17 @@ class ConfigHelper:
try:
with open(state_path) as f:
return json.load(f)
data = json.load(f)
# Validate basic structure
if not isinstance(data, dict):
print(f"❌ Invalid state format in {self.state_file}")
return None
return data # type: ignore
except (OSError, json.JSONDecodeError) as e:
print(f"❌ Error reading {self.state_file}: {e}")
return None
def write_state(self, data: dict[str, Any]) -> bool:
def write_state(self, data: StressTestState) -> bool:
"""Write the entire stress test state.
Args:
@ -172,32 +214,32 @@ class ConfigHelper:
print(f"❌ Error writing {self.state_file}: {e}")
return False
def update_state_section(self, section: str, data: dict[str, Any]) -> bool:
def update_state_section[T](self, section: str, data: T) -> bool:
"""Update a specific section of the stress test state.
Args:
section: Name of the section to update (e.g., 'admin', 'auth', 'app', 'api_key')
data: Dictionary containing section data to save
data: Section data to save
Returns:
True if successful, False otherwise
"""
state = self.read_state() or {}
state[section] = data
return self.write_state(state)
state[section] = data # type: ignore
return self.write_state(state) # type: ignore
def get_state_section(self, section: str) -> dict[str, Any] | None:
def get_state_section[T](self, section: str) -> T | None:
"""Get a specific section from the stress test state.
Args:
section: Name of the section to get (e.g., 'admin', 'auth', 'app', 'api_key')
Returns:
Dictionary containing section data, or None if not found
Section data of type T, or None if not found
"""
state = self.read_state()
if state:
return state.get(section)
return state.get(section) # type: ignore
return None
def get_token(self) -> str | None:
@ -206,7 +248,7 @@ class ConfigHelper:
Returns:
Access token string or None if not found
"""
auth = self.get_state_section("auth")
auth = self.get_state_section[AuthConfig]("auth")
if auth:
return auth.get("access_token")
return None
@ -217,7 +259,7 @@ class ConfigHelper:
Returns:
App ID string or None if not found
"""
app = self.get_state_section("app")
app = self.get_state_section[AppConfig]("app")
if app:
return app.get("app_id")
return None
@ -228,7 +270,7 @@ class ConfigHelper:
Returns:
API key token string or None if not found
"""
api_key = self.get_state_section("api_key")
api_key = self.get_state_section[ApiKeyConfig]("api_key")
if api_key:
return api_key.get("token")
return None

13
scripts/stress-test/setup/mock_openai_server.py
View File

@ -4,7 +4,6 @@ import json
import time
import uuid
from collections.abc import Iterator
from typing import Any
from flask import Flask, Response, jsonify, request
@ -29,13 +28,13 @@ MODELS = [
@app.route("/v1/models", methods=["GET"])
def list_models() -> Any:
def list_models() -> Response:
"""List available models."""
return jsonify({"object": "list", "data": MODELS})
@app.route("/v1/chat/completions", methods=["POST"])
def chat_completions() -> Any:
def chat_completions() -> Response:
"""Handle chat completions."""
data = request.json or {}
model = data.get("model", "gpt-3.5-turbo")
@ -123,7 +122,7 @@ def chat_completions() -> Any:
@app.route("/v1/completions", methods=["POST"])
def completions() -> Any:
def completions() -> Response:
"""Handle text completions."""
data = request.json or {}
model = data.get("model", "gpt-3.5-turbo-instruct")
@ -155,7 +154,7 @@ def completions() -> Any:
@app.route("/v1/embeddings", methods=["POST"])
def embeddings() -> Any:
def embeddings() -> Response:
"""Handle embeddings requests."""
data = request.json or {}
model = data.get("model", "text-embedding-ada-002")
@ -178,7 +177,7 @@ def embeddings() -> Any:
@app.route("/v1/models/<model_id>", methods=["GET"])
def get_model(model_id: str) -> tuple[Any, int] | Any:
def get_model(model_id: str) -> Response | tuple[Response, int]:
"""Get specific model details."""
for model in MODELS:
if model["id"] == model_id:
@ -188,7 +187,7 @@ def get_model(model_id: str) -> tuple[Any, int] | Any:
@app.route("/health", methods=["GET"])
def health() -> Any:
def health() -> Response:
"""Health check endpoint."""
return jsonify({"status": "healthy"})