Skip to content

Commit e256124

Browse files
committed
refactor: rename var by review and release 0.1.10 version
(cherry picked from commit cf4c110663d92481fa8e19367b7b42dd2455d5d2)
1 parent 3cab01e commit e256124

File tree

16 files changed

+149
-152
lines changed

16 files changed

+149
-152
lines changed

agentkit/toolkit/cli/cli_config.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,16 +204,16 @@ def _interactive_config(config_file: Optional[str] = None):
204204
# Use CLI-layer interactive config generation
205205
from agentkit.toolkit.cli.interactive_config import generate_config_from_dataclass
206206
from agentkit.toolkit.config.strategy_configs import (
207-
LocalDockerConfig,
208-
VeAgentkitConfig,
209-
HybridVeAgentkitConfig
207+
LocalStrategyConfig,
208+
CloudStrategyConfig,
209+
HybridStrategyConfig
210210
)
211211

212212
# Map strategy_name to config class
213213
strategy_config_classes = {
214-
"local": LocalDockerConfig,
215-
"cloud": VeAgentkitConfig,
216-
"hybrid": HybridVeAgentkitConfig,
214+
"local": LocalStrategyConfig,
215+
"cloud": CloudStrategyConfig,
216+
"hybrid": HybridStrategyConfig,
217217
}
218218

219219
# Get current strategy config data

agentkit/toolkit/config/__init__.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
)
2121

2222
from .strategy_configs import (
23-
LocalDockerConfig,
24-
HybridVeAgentkitConfig,
25-
VeAgentkitConfig,
23+
LocalStrategyConfig,
24+
HybridStrategyConfig,
25+
CloudStrategyConfig,
2626
)
2727

2828
from .docker_build_config import (
@@ -45,14 +45,12 @@
4545
from .constants import *
4646

4747
__all__ = [
48-
# 项目配置相关
4948
"AgentkitConfigManager",
5049
"CommonConfig",
5150
"ConfigUpdateResult",
5251
"get_config",
5352
"create_config_update_result",
5453

55-
# 全局配置相关
5654
"GlobalConfig",
5755
"GlobalConfigManager",
5856
"get_global_config",
@@ -63,7 +61,6 @@
6361
"CRGlobalConfig",
6462
"TOSGlobalConfig",
6563

66-
# 常量
6764
"AUTO_CREATE_VE",
6865
"DEFAULT_WORKSPACE_NAME",
6966
"DEFAULT_CR_NAMESPACE",
@@ -72,16 +69,13 @@
7269
"GLOBAL_CONFIG_FILE",
7370
"GLOBAL_CONFIG_FILE_PERMISSIONS",
7471

75-
# 工具函数
7672
"is_valid_config",
7773
"is_invalid_config",
7874
"merge_runtime_envs",
7975

80-
# Strongly 配置类
81-
"LocalDockerConfig",
82-
"HybridVeAgentkitConfig",
83-
"VeAgentkitConfig",
76+
"LocalStrategyConfig",
77+
"HybridStrategyConfig",
78+
"CloudStrategyConfig",
8479

85-
# Docker构建配置
8680
"DockerBuildConfig",
8781
]

agentkit/toolkit/config/config.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,14 @@ def _reorder_by_dataclass_fields(self, strategy_name: str, config: Dict[str, Any
354354

355355
config_class = None
356356
if strategy_name == "local":
357-
from agentkit.toolkit.config import LocalDockerConfig
358-
config_class = LocalDockerConfig
357+
from agentkit.toolkit.config import LocalStrategyConfig
358+
config_class = LocalStrategyConfig
359359
elif strategy_name == "cloud":
360-
from agentkit.toolkit.config import VeAgentkitConfig
361-
config_class = VeAgentkitConfig
360+
from agentkit.toolkit.config import CloudStrategyConfig
361+
config_class = CloudStrategyConfig
362362
elif strategy_name == "hybrid":
363-
from agentkit.toolkit.config import HybridVeAgentkitConfig
364-
config_class = HybridVeAgentkitConfig
363+
from agentkit.toolkit.config import HybridStrategyConfig
364+
config_class = HybridStrategyConfig
365365
else:
366366
return config
367367

agentkit/toolkit/config/global_config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,19 @@ def apply_global_config_defaults(
301301
302302
Example:
303303
>>> # project config has empty cr_instance_name
304-
>>> config = HybridVeAgentkitConfig.from_dict({"cr_instance_name": ""})
304+
>>> config = HybridStrategyConfig.from_dict({"cr_instance_name": ""})
305305
>>> # apply_global_config_defaults will fill from global config if set
306306
>>> # config.cr_instance_name = "my-team-cr-instance" (from global config)
307307
"""
308308
# Lazy imports to avoid circular dependencies
309309
try:
310-
from .strategy_configs import HybridVeAgentkitConfig, VeAgentkitConfig
310+
from .strategy_configs import HybridStrategyConfig, CloudStrategyConfig
311311
except ImportError as e:
312312
logger.debug(f"Failed to import strategy config classes, skip applying global config defaults: {e}")
313313
return config_obj
314314

315315
# Only handle strategy config classes
316-
if not isinstance(config_obj, (HybridVeAgentkitConfig, VeAgentkitConfig)):
316+
if not isinstance(config_obj, (HybridStrategyConfig, CloudStrategyConfig)):
317317
return config_obj
318318

319319
try:
@@ -327,7 +327,7 @@ def apply_global_config_defaults(
327327
}
328328

329329
# For VeAgentkitConfig, also apply TOS-related settings
330-
if isinstance(config_obj, VeAgentkitConfig):
330+
if isinstance(config_obj, CloudStrategyConfig):
331331
field_mappings.update({
332332
'tos_bucket': ('tos', 'bucket'),
333333
'tos_prefix': ('tos', 'prefix'),

agentkit/toolkit/config/strategy_configs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
@dataclass
8-
class LocalDockerConfig(AutoSerializableMixin):
8+
class LocalStrategyConfig(AutoSerializableMixin):
99
"""Local Docker strategy configuration for running agents in Docker containers."""
1010
# User-configurable fields
1111
image_tag: str = field(default="latest", metadata={"description": "Docker image tag", "icon": "🏷️"})
@@ -33,7 +33,7 @@ class LocalDockerConfig(AutoSerializableMixin):
3333
}
3434
)
3535
_config_metadata = {
36-
'name': 'Local Docker Configuration',
36+
'name': 'Local Strategy Configuration',
3737
'welcome_message': 'Welcome to AgentKit Local Docker Mode Configuration Wizard',
3838
'next_step_hint': 'This wizard will help you configure your agent for local Docker deployment. Please provide the required information or press Enter to use default values.',
3939
'completion_message': 'Great! Local Docker configuration is complete!',
@@ -42,7 +42,7 @@ class LocalDockerConfig(AutoSerializableMixin):
4242

4343

4444
@dataclass
45-
class HybridVeAgentkitConfig(AutoSerializableMixin):
45+
class HybridStrategyConfig(AutoSerializableMixin):
4646
"""Hybrid deployment strategy configuration combining local Docker and Volcano Engine services."""
4747
# User-configurable fields
4848
image_tag: str = field(default=DEFAULT_IMAGE_TAG, metadata={"system": True, "description": "Docker image tag", "icon": "🏷️", "render_template": True})
@@ -77,7 +77,7 @@ class HybridVeAgentkitConfig(AutoSerializableMixin):
7777
}
7878
)
7979
_config_metadata = {
80-
'name': 'Hybrid Deployment Configuration',
80+
'name': 'Hybrid Strategy Configuration',
8181
'welcome_message': 'Welcome to AgentKit Hybrid Deployment Mode Configuration Wizard',
8282
'next_step_hint': 'This wizard will help you configure your agent for hybrid deployment combining local Docker and Volcano Engine services. Please provide the required information or press Enter to use default values.',
8383
'completion_message': 'Great! Hybrid deployment configuration is complete!',
@@ -87,7 +87,7 @@ class HybridVeAgentkitConfig(AutoSerializableMixin):
8787

8888

8989
@dataclass
90-
class VeAgentkitConfig(AutoSerializableMixin):
90+
class CloudStrategyConfig(AutoSerializableMixin):
9191
"""Cloud build and deployment strategy configuration for Volcano Engine."""
9292
region: str = field(
9393
default="cn-beijing",

agentkit/toolkit/executors/base_executor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ def _get_strategy_config_object(self, config, launch_type: str, skip_render: boo
243243
strategy_config_dict = config.get_strategy_config(launch_type)
244244

245245
if launch_type == "local":
246-
from agentkit.toolkit.config import LocalDockerConfig
247-
return LocalDockerConfig.from_dict(strategy_config_dict, skip_render=skip_render)
246+
from agentkit.toolkit.config import LocalStrategyConfig
247+
return LocalStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
248248
elif launch_type == "cloud":
249-
from agentkit.toolkit.config import VeAgentkitConfig
250-
return VeAgentkitConfig.from_dict(strategy_config_dict, skip_render=skip_render)
249+
from agentkit.toolkit.config import CloudStrategyConfig
250+
return CloudStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
251251
elif launch_type == "hybrid":
252-
from agentkit.toolkit.config import HybridVeAgentkitConfig
253-
return HybridVeAgentkitConfig.from_dict(strategy_config_dict, skip_render=skip_render)
252+
from agentkit.toolkit.config import HybridStrategyConfig
253+
return HybridStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
254254
else:
255255
raise ValueError(f"Unknown launch_type: {launch_type}")
256256

0 commit comments

Comments
 (0)