Skip to content

Commit 51af11b

Browse files
juanmichelinijuanmichelini
authored
Merge branch 'main' into fix/tool-call-compat-shim
2 parents c44742e + 53b8038 commit 51af11b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+927
-454
lines changed

‎examples/01_standalone_sdk/43_mixed_marketplace_skills/main.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import sys
3838
from pathlib import Path
3939

40-
from openhands.sdk.plugin import Marketplace
40+
from openhands.sdk.marketplace import Marketplace
4141
from openhands.sdk.skills import (
4242
install_skills_from_marketplace,
4343
list_installed_skills,

‎examples/05_skills_and_plugins/01_loading_agentskills/main.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from pydantic import SecretStr
2828

2929
from openhands.sdk import LLM, Agent, AgentContext, Conversation
30-
from openhands.sdk.context.skills import (
30+
from openhands.sdk.skills import (
3131
discover_skill_resources,
3232
load_skills_from_dir,
3333
)

‎openhands-agent-server/openhands/agent_server/skills_router.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
load_all_skills,
1515
sync_public_skills,
1616
)
17-
from openhands.sdk.context.skills.skill import DEFAULT_MARKETPLACE_PATH
17+
from openhands.sdk.skills.skill import DEFAULT_MARKETPLACE_PATH
1818

1919

2020
skills_router = APIRouter(prefix="/skills", tags=["Skills"])

‎openhands-agent-server/openhands/agent_server/skills_service.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
from dataclasses import dataclass
2121
from pathlib import Path
2222

23-
from openhands.sdk.context.skills import (
23+
from openhands.sdk.logger import get_logger
24+
from openhands.sdk.skills import (
2425
Skill,
2526
load_available_skills,
2627
)
27-
from openhands.sdk.context.skills.skill import (
28+
from openhands.sdk.skills.skill import (
2829
DEFAULT_MARKETPLACE_PATH,
2930
PUBLIC_SKILLS_BRANCH,
3031
PUBLIC_SKILLS_REPO,
3132
load_skills_from_dir,
3233
)
33-
from openhands.sdk.context.skills.utils import (
34+
from openhands.sdk.skills.utils import (
3435
get_skills_cache_dir,
3536
update_skills_repository,
3637
)
37-
from openhands.sdk.logger import get_logger
3838
from openhands.sdk.utils import sanitized_env
3939

4040

‎openhands-sdk/openhands/sdk/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
AgentBase,
66
)
77
from openhands.sdk.banner import _print_banner
8-
from openhands.sdk.context import (
9-
AgentContext,
10-
load_project_skills,
11-
load_skills_from_dir,
12-
load_user_skills,
13-
)
8+
from openhands.sdk.context import AgentContext
149
from openhands.sdk.context.condenser import (
1510
LLMSummarizingCondenser,
1611
)
@@ -65,6 +60,11 @@
6560
SettingsSectionMetadata,
6661
field_meta,
6762
)
63+
from openhands.sdk.skills import (
64+
load_project_skills,
65+
load_skills_from_dir,
66+
load_user_skills,
67+
)
6868
from openhands.sdk.subagent import (
6969
agent_definition_to_factory,
7070
load_agents_from_dir,

‎openhands-sdk/openhands/sdk/context/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from openhands.sdk.context.agent_context import AgentContext
22
from openhands.sdk.context.prompts import render_template
3-
from openhands.sdk.context.skills import (
3+
4+
# Import from canonical location (openhands.sdk.skills)
5+
from openhands.sdk.skills import (
46
BaseTrigger,
57
KeywordTrigger,
68
Skill,

‎openhands-sdk/openhands/sdk/context/agent_context.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
from pydantic import BaseModel, Field, field_validator, model_validator
88

99
from openhands.sdk.context.prompts import render_template
10-
from openhands.sdk.context.skills import (
10+
from openhands.sdk.llm import Message, TextContent
11+
from openhands.sdk.llm.utils.model_prompt_spec import get_model_prompt_spec
12+
from openhands.sdk.logger import get_logger
13+
from openhands.sdk.secret import SecretSource, SecretValue
14+
from openhands.sdk.skills import (
1115
Skill,
1216
SkillKnowledge,
1317
load_available_skills,
1418
to_prompt,
1519
)
16-
from openhands.sdk.context.skills.skill import DEFAULT_MARKETPLACE_PATH
17-
from openhands.sdk.llm import Message, TextContent
18-
from openhands.sdk.llm.utils.model_prompt_spec import get_model_prompt_spec
19-
from openhands.sdk.logger import get_logger
20-
from openhands.sdk.secret import SecretSource, SecretValue
20+
from openhands.sdk.skills.skill import DEFAULT_MARKETPLACE_PATH
2121

2222

2323
logger = get_logger(__name__)

‎openhands-sdk/openhands/sdk/context/skills/__init__.py‎

Lines changed: 111 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,124 @@
1-
from openhands.sdk.context.skills.exceptions import SkillValidationError
2-
from openhands.sdk.context.skills.skill import (
3-
Skill,
4-
SkillResources,
5-
load_available_skills,
6-
load_project_skills,
7-
load_public_skills,
8-
load_skills_from_dir,
9-
load_user_skills,
10-
to_prompt,
11-
)
12-
from openhands.sdk.context.skills.trigger import (
13-
BaseTrigger,
14-
KeywordTrigger,
15-
TaskTrigger,
16-
)
17-
from openhands.sdk.context.skills.types import SkillKnowledge
18-
from openhands.sdk.context.skills.utils import (
19-
RESOURCE_DIRECTORIES,
20-
discover_skill_resources,
21-
validate_skill_name,
22-
)
1+
"""Deprecated: Use openhands.sdk.skills instead.
2+
3+
This module is deprecated and will be removed in a future version.
4+
All skill-related imports should come from `openhands.sdk.skills`.
5+
6+
Migration guide:
7+
# Old (deprecated):
8+
from openhands.sdk.context.skills import Skill, load_skills_from_dir
9+
10+
# New:
11+
from openhands.sdk.skills import Skill, load_skills_from_dir
12+
"""
13+
14+
from openhands.sdk.utils.deprecation import warn_deprecated
15+
16+
17+
def __getattr__(name: str):
18+
"""Lazily import from openhands.sdk.skills with deprecation warning."""
19+
# Import the canonical module
20+
from openhands.sdk import skills as _skills
21+
22+
# List of valid exports that we re-export with deprecation warning
23+
_VALID_EXPORTS = {
24+
# Exceptions
25+
"SkillError",
26+
"SkillValidationError",
27+
# Core skill model and loading
28+
"Skill",
29+
"SkillInfo",
30+
"SkillResources",
31+
"load_skills_from_dir",
32+
"load_project_skills",
33+
"load_user_skills",
34+
"load_public_skills",
35+
"load_available_skills",
36+
"to_prompt",
37+
# Triggers
38+
"BaseTrigger",
39+
"KeywordTrigger",
40+
"TaskTrigger",
41+
# Types
42+
"SkillKnowledge",
43+
"InputMetadata",
44+
"SkillResponse",
45+
"SkillContentResponse",
46+
# Utilities
47+
"discover_skill_resources",
48+
"RESOURCE_DIRECTORIES",
49+
"validate_skill_name",
50+
}
51+
52+
if name in _VALID_EXPORTS:
53+
warn_deprecated(
54+
f"Importing '{name}' from 'openhands.sdk.context.skills'",
55+
deprecated_in="1.16.0",
56+
removed_in="1.20.0",
57+
details=f"Use 'from openhands.sdk.skills import {name}' instead.",
58+
stacklevel=3,
59+
)
60+
return getattr(_skills, name)
61+
62+
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
63+
64+
65+
def __dir__():
66+
"""List available attributes for tab-completion."""
67+
return [
68+
# Exceptions
69+
"SkillError",
70+
"SkillValidationError",
71+
# Core skill model and loading
72+
"Skill",
73+
"SkillInfo",
74+
"SkillResources",
75+
"load_skills_from_dir",
76+
"load_project_skills",
77+
"load_user_skills",
78+
"load_public_skills",
79+
"load_available_skills",
80+
"to_prompt",
81+
# Triggers
82+
"BaseTrigger",
83+
"KeywordTrigger",
84+
"TaskTrigger",
85+
# Types
86+
"SkillKnowledge",
87+
"InputMetadata",
88+
"SkillResponse",
89+
"SkillContentResponse",
90+
# Utilities
91+
"discover_skill_resources",
92+
"RESOURCE_DIRECTORIES",
93+
"validate_skill_name",
94+
]
2395

2496

2597
__all__ = [
98+
# Exceptions
99+
"SkillError",
100+
"SkillValidationError",
101+
# Core skill model and loading
26102
"Skill",
103+
"SkillInfo",
27104
"SkillResources",
105+
"load_skills_from_dir",
106+
"load_project_skills",
107+
"load_user_skills",
108+
"load_public_skills",
109+
"load_available_skills",
110+
"to_prompt",
111+
# Triggers
28112
"BaseTrigger",
29113
"KeywordTrigger",
30114
"TaskTrigger",
115+
# Types
31116
"SkillKnowledge",
32-
"load_available_skills",
33-
"load_skills_from_dir",
34-
"load_user_skills",
35-
"load_project_skills",
36-
"load_public_skills",
37-
"SkillValidationError",
117+
"InputMetadata",
118+
"SkillResponse",
119+
"SkillContentResponse",
120+
# Utilities
38121
"discover_skill_resources",
39122
"RESOURCE_DIRECTORIES",
40-
"to_prompt",
41123
"validate_skill_name",
42124
]

‎openhands-sdk/openhands/sdk/marketplace/__init__.py‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
"""Marketplace module for OpenHands SDK.
2+
3+
This module provides support for plugin and skill marketplaces - directories
4+
that list available plugins and skills with their metadata and source locations.
5+
6+
A marketplace is defined by a `marketplace.json` file in a `.plugin/` or
7+
`.claude-plugin/` directory at the root of a repository. It lists plugins and
8+
skills available for installation, along with metadata like descriptions,
9+
versions, and authors.
10+
11+
Example marketplace.json:
12+
```json
13+
{
14+
"name": "company-tools",
15+
"owner": {"name": "DevTools Team"},
16+
"plugins": [
17+
{"name": "formatter", "source": "./plugins/formatter"}
18+
],
19+
"skills": [
20+
{"name": "github", "source": "./skills/github"}
21+
]
22+
}
23+
```
24+
"""
25+
26+
from openhands.sdk.marketplace.types import (
27+
MARKETPLACE_MANIFEST_DIRS,
28+
MARKETPLACE_MANIFEST_FILE,
29+
Marketplace,
30+
MarketplaceEntry,
31+
MarketplaceMetadata,
32+
MarketplaceOwner,
33+
MarketplacePluginEntry,
34+
MarketplacePluginSource,
35+
)
36+
37+
38+
__all__ = [
39+
# Constants
40+
"MARKETPLACE_MANIFEST_DIRS",
41+
"MARKETPLACE_MANIFEST_FILE",
42+
# Marketplace classes
43+
"Marketplace",
44+
"MarketplaceEntry",
45+
"MarketplaceOwner",
46+
"MarketplacePluginEntry",
47+
"MarketplacePluginSource",
48+
"MarketplaceMetadata",
49+
]

0 commit comments

Comments
 (0)