Skip to content

add properties on chunk #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kanchengw merged 1 commit into from
May 27, 2026
Merged

add properties on chunk #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 configs/baidu/request_baidu.yaml → cnllm/configs/baidu/request_baidu.yaml
View file
Open in desktop
File renamed without changes.
0 configs/baidu/response_baidu.yaml → cnllm/configs/baidu/response_baidu.yaml
View file
Open in desktop
File renamed without changes.
0 configs/deepseek/request_deepseek.yaml → cnllm/configs/deepseek/request_deepseek.yaml
View file
Open in desktop
File renamed without changes.
0 configs/deepseek/response_deepseek.yaml → ...m/configs/deepseek/response_deepseek.yaml
View file
Open in desktop
File renamed without changes.
0 configs/doubao/request_doubao.yaml → cnllm/configs/doubao/request_doubao.yaml
View file
Open in desktop
File renamed without changes.
0 configs/doubao/response_doubao.yaml → cnllm/configs/doubao/response_doubao.yaml
View file
Open in desktop
File renamed without changes.
0 configs/glm/request_glm.yaml → cnllm/configs/glm/request_glm.yaml
View file
Open in desktop
File renamed without changes.
0 configs/glm/response_glm.yaml → cnllm/configs/glm/response_glm.yaml
View file
Open in desktop
File renamed without changes.
0 configs/hunyuan/request_hunyuan.yaml → cnllm/configs/hunyuan/request_hunyuan.yaml
View file
Open in desktop
File renamed without changes.
0 configs/hunyuan/response_hunyuan.yaml → cnllm/configs/hunyuan/response_hunyuan.yaml
View file
Open in desktop
File renamed without changes.
0 configs/kimi/request_kimi.yaml → cnllm/configs/kimi/request_kimi.yaml
View file
Open in desktop
File renamed without changes.
0 configs/kimi/response_kimi.yaml → cnllm/configs/kimi/response_kimi.yaml
View file
Open in desktop
File renamed without changes.
0 configs/minimax/request_minimax.yaml → cnllm/configs/minimax/request_minimax.yaml
View file
Open in desktop
File renamed without changes.
0 configs/minimax/response_minimax.yaml → cnllm/configs/minimax/response_minimax.yaml
View file
Open in desktop
File renamed without changes.
0 configs/qwen/request_qwen.yaml → cnllm/configs/qwen/request_qwen.yaml
View file
Open in desktop
File renamed without changes.
0 configs/qwen/response_qwen.yaml → cnllm/configs/qwen/response_qwen.yaml
View file
Open in desktop
File renamed without changes.
0 configs/xiaomi/request_xiaomi.yaml → cnllm/configs/xiaomi/request_xiaomi.yaml
View file
Open in desktop
File renamed without changes.
0 configs/xiaomi/response_xiaomi.yaml → cnllm/configs/xiaomi/response_xiaomi.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cnllm/core/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def _load_class_config(cls) -> Dict[str, Any]:

config_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", cls.CONFIG_DIR, f"request_{cls.ADAPTER_NAME}.yaml"
"..", "configs", cls.CONFIG_DIR, f"request_{cls.ADAPTER_NAME}.yaml"
)
try:
import yaml
Expand Down
16 changes: 8 additions & 8 deletions cnllm/core/embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ def _find_config_for_model(model: str) -> tuple:
config_dir = adapter_name.replace("-embedding", "")
merged_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", config_dir,
"..", "configs", config_dir,
f"request_{config_dir}.yaml"
)
legacy_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", config_dir,
"..", "configs", config_dir,
f"request_embedding_{config_dir}.yaml"
)
config_path = merged_path if os.path.exists(merged_path) else legacy_path
Expand All @@ -49,12 +49,12 @@ def _find_config_for_model(model: str) -> tuple:
def _get_config_for_adapter(adapter_name: str) -> tuple:
merged_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", adapter_name,
"..", "configs", adapter_name,
f"request_{adapter_name}.yaml"
)
legacy_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", adapter_name,
"..", "configs", adapter_name,
f"request_embedding_{adapter_name}.yaml"
)
config_path = merged_path if os.path.exists(merged_path) else legacy_path
Expand All @@ -81,7 +81,7 @@ def _load_config(self) -> Dict[str, Any]:
import yaml
config_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", self.config_dir,
"..", "configs", self.config_dir,
f"response_embedding_{self.config_dir}.yaml"
)
try:
Expand Down Expand Up @@ -176,12 +176,12 @@ def _load_class_config(cls) -> Dict[str, Any]:

merged_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", cls.CONFIG_DIR,
"..", "configs", cls.CONFIG_DIR,
f"request_{cls.CONFIG_DIR}.yaml"
)
legacy_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", cls.CONFIG_DIR,
"..", "configs", cls.CONFIG_DIR,
f"request_embedding_{cls.CONFIG_DIR}.yaml"
)
config_path = merged_path if os.path.exists(merged_path) else legacy_path
Expand Down Expand Up @@ -229,7 +229,7 @@ def __init__(
if config_file is None:
merged_config = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", self.CONFIG_DIR,
"..", "configs", self.CONFIG_DIR,
f"request_{self.CONFIG_DIR}.yaml"
)
legacy_config = f"request_embedding_{self.CONFIG_DIR}.yaml"
Expand Down
2 changes: 1 addition & 1 deletion cnllm/core/responder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, config_dir: str = None):
def _load_config(self) -> Dict[str, Any]:
config_path = os.path.join(
os.path.dirname(__file__),
"..", "..", "configs", self.config_dir, f"response_{self.config_dir}.yaml"
"..", "configs", self.config_dir, f"response_{self.config_dir}.yaml"
)
try:
import yaml
Expand Down
5 changes: 2 additions & 3 deletions cnllm/utils/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def _load_config(self) -> Dict[str, Any]:
config_path = os.path.join(
os.path.dirname(__file__),
"..",
"..",
"configs",
self.config_dir,
self.config_file
Expand Down Expand Up @@ -191,7 +190,7 @@ def detect_protocol(base_url: str, config_dir: str) -> str:
"""
import os, yaml
# 查找 YAML 文件
base_path = os.path.join(os.path.dirname(__file__), "..", "..", "configs", config_dir)
base_path = os.path.join(os.path.dirname(__file__), "..", "configs", config_dir)
for candidate in [f"request_{config_dir}.yaml", f"request_{config_dir}.yml"]:
yaml_path = os.path.join(base_path, candidate)
if os.path.exists(yaml_path):
Expand Down Expand Up @@ -228,7 +227,7 @@ def has_protocol_config(config_dir: str) -> bool:
其他无多协议的厂商返回 False，避免不必要的 protocol 检测。
"""
import os, yaml
base_path = os.path.join(os.path.dirname(__file__), "..", "..", "configs", config_dir)
base_path = os.path.join(os.path.dirname(__file__), "..", "configs", config_dir)
for candidate in [f"request_{config_dir}.yaml", f"request_{config_dir}.yml"]:
yaml_path = os.path.join(base_path, candidate)
if os.path.exists(yaml_path):
Expand Down
1 change: 0 additions & 1 deletion cnllm/utils/vendor_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def _load_config(self) -> Dict[str, Any]:
config_path = os.path.join(
os.path.dirname(__file__),
"..",
"..",
"configs",
self.config_dir,
f"request_{self.config_dir}.yaml"
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ asyncio_mode = "auto"
[tool.setuptools.packages.find]
where = ["."]
include = ["cnllm*"]

[tool.setuptools]
include-package-data = true
Loading