cleanup pre-commit

This commit is contained in:
Ashwin Bharambe 2025-11-17 12:30:38 -08:00
parent 47027c65a0
commit 22e6869ee5
4 changed files with 29 additions and 66 deletions

View file

@ -14,10 +14,10 @@ AWS Bedrock inference provider using OpenAI compatible endpoint.
| Field | Type | Required | Default | Description | | Field | Type | Required | Default | Description |
|-------|------|----------|---------|-------------| |-------|------|----------|---------|-------------|
| `allowed_models` | `list[str \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. | | `allowed_models` | `list[str] \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. |
| `refresh_models` | `<class 'bool'>` | No | False | Whether to refresh models periodically from the provider | | `refresh_models` | `bool` | No | False | Whether to refresh models periodically from the provider |
| `api_key` | `pydantic.types.SecretStr \| None` | No | | Authentication credential for the provider | | `api_key` | `SecretStr \| None` | No | | Authentication credential for the provider |
| `region_name` | `<class 'str'>` | No | us-east-2 | AWS Region for the Bedrock Runtime endpoint | | `region_name` | `str` | No | us-east-2 | AWS Region for the Bedrock Runtime endpoint |
## Sample Configuration ## Sample Configuration

View file

@ -21,14 +21,14 @@ https://docs.oracle.com/en-us/iaas/Content/generative-ai/home.htm
| Field | Type | Required | Default | Description | | Field | Type | Required | Default | Description |
|-------|------|----------|---------|-------------| |-------|------|----------|---------|-------------|
| `allowed_models` | `list[str \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. | | `allowed_models` | `list[str] \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. |
| `refresh_models` | `<class 'bool'>` | No | False | Whether to refresh models periodically from the provider | | `refresh_models` | `bool` | No | False | Whether to refresh models periodically from the provider |
| `api_key` | `pydantic.types.SecretStr \| None` | No | | Authentication credential for the provider | | `api_key` | `SecretStr \| None` | No | | Authentication credential for the provider |
| `oci_auth_type` | `<class 'str'>` | No | instance_principal | OCI authentication type (must be one of: instance_principal, config_file) | | `oci_auth_type` | `str` | No | instance_principal | OCI authentication type (must be one of: instance_principal, config_file) |
| `oci_region` | `<class 'str'>` | No | us-ashburn-1 | OCI region (e.g., us-ashburn-1) | | `oci_region` | `str` | No | us-ashburn-1 | OCI region (e.g., us-ashburn-1) |
| `oci_compartment_id` | `<class 'str'>` | No | | OCI compartment ID for the Generative AI service | | `oci_compartment_id` | `str` | No | | OCI compartment ID for the Generative AI service |
| `oci_config_file_path` | `<class 'str'>` | No | ~/.oci/config | OCI config file path (required if oci_auth_type is config_file) | | `oci_config_file_path` | `str` | No | ~/.oci/config | OCI config file path (required if oci_auth_type is config_file) |
| `oci_config_profile` | `<class 'str'>` | No | DEFAULT | OCI config profile (required if oci_auth_type is config_file) | | `oci_config_profile` | `str` | No | DEFAULT | OCI config profile (required if oci_auth_type is config_file) |
## Sample Configuration ## Sample Configuration

View file

@ -16,7 +16,7 @@ Passthrough inference provider for connecting to any external inference service
|-------|------|----------|---------|-------------| |-------|------|----------|---------|-------------|
| `allowed_models` | `list[str] \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. | | `allowed_models` | `list[str] \| None` | No | | List of models that should be registered with the model registry. If None, all models are allowed. |
| `refresh_models` | `bool` | No | False | Whether to refresh models periodically from the provider | | `refresh_models` | `bool` | No | False | Whether to refresh models periodically from the provider |
| `api_key` | `SecretStr \| None` | No | | API Key for the passthrouth endpoint | | `api_key` | `SecretStr \| None` | No | | Authentication credential for the provider |
| `url` | `str` | No | | The URL for the passthrough endpoint | | `url` | `str` | No | | The URL for the passthrough endpoint |
## Sample Configuration ## Sample Configuration

View file

@ -23,9 +23,7 @@ def get_api_docstring(api_name: str) -> str | None:
"""Extract docstring from the API protocol class.""" """Extract docstring from the API protocol class."""
try: try:
# Import the API module dynamically # Import the API module dynamically
api_module = __import__( api_module = __import__(f"llama_stack_api.{api_name}", fromlist=[api_name.title()])
f"llama_stack_api.{api_name}", fromlist=[api_name.title()]
)
# Get the main protocol class (usually capitalized API name) # Get the main protocol class (usually capitalized API name)
protocol_class_name = api_name.title() protocol_class_name = api_name.title()
@ -108,10 +106,7 @@ def get_config_class_info(config_class_path: str) -> dict[str, Any]:
model_config = config_class.model_config model_config = config_class.model_config
if hasattr(model_config, "extra") and model_config.extra == "allow": if hasattr(model_config, "extra") and model_config.extra == "allow":
accepts_extra_config = True accepts_extra_config = True
elif ( elif isinstance(model_config, dict) and model_config.get("extra") == "allow":
isinstance(model_config, dict)
and model_config.get("extra") == "allow"
):
accepts_extra_config = True accepts_extra_config = True
fields_info = {} fields_info = {}
@ -129,10 +124,7 @@ def get_config_class_info(config_class_path: str) -> dict[str, Any]:
# HACK ALERT: # HACK ALERT:
# If the default value contains a path that looks like it came from RUNTIME_BASE_DIR, # If the default value contains a path that looks like it came from RUNTIME_BASE_DIR,
# replace it with a generic ~/.llama/ path for documentation # replace it with a generic ~/.llama/ path for documentation
if ( if isinstance(default_value, str) and "/.llama/" in default_value:
isinstance(default_value, str)
and "/.llama/" in default_value
):
if ".llama/" in default_value: if ".llama/" in default_value:
path_part = default_value.split(".llama/")[-1] path_part = default_value.split(".llama/")[-1]
default_value = f"~/.llama/{path_part}" default_value = f"~/.llama/{path_part}"
@ -161,11 +153,7 @@ def get_config_class_info(config_class_path: str) -> dict[str, Any]:
lines = source.split("\n") lines = source.split("\n")
for i, line in enumerate(lines): for i, line in enumerate(lines):
if ( if "model_config" in line and "ConfigDict" in line and 'extra="allow"' in line:
"model_config" in line
and "ConfigDict" in line
and 'extra="allow"' in line
):
comments = [] comments = []
for j in range(i - 1, -1, -1): for j in range(i - 1, -1, -1):
stripped = lines[j].strip() stripped = lines[j].strip()
@ -230,9 +218,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
# Create sidebar label (clean up provider_type for display) # Create sidebar label (clean up provider_type for display)
sidebar_label = provider_type.replace("::", " - ").replace("_", " ") sidebar_label = provider_type.replace("::", " - ").replace("_", " ")
if sidebar_label.startswith("inline - "): if sidebar_label.startswith("inline - "):
sidebar_label = sidebar_label[ sidebar_label = sidebar_label[9:].title() # Remove "inline - " prefix and title case
9:
].title() # Remove "inline - " prefix and title case
else: else:
sidebar_label = sidebar_label.title() sidebar_label = sidebar_label.title()
@ -275,9 +261,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
for field_name, field_info in config_info["fields"].items(): for field_name, field_info in config_info["fields"].items():
field_type = field_info["type"].replace("|", "\\|") field_type = field_info["type"].replace("|", "\\|")
required = "Yes" if field_info["required"] else "No" required = "Yes" if field_info["required"] else "No"
default = ( default = str(field_info["default"]) if field_info["default"] is not None else ""
str(field_info["default"]) if field_info["default"] is not None else ""
)
# Handle multiline default values and escape problematic characters for MDX # Handle multiline default values and escape problematic characters for MDX
if "\n" in default: if "\n" in default:
@ -287,9 +271,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
for line in lines: for line in lines:
if line.strip(): if line.strip():
# Escape angle brackets and wrap template tokens in backticks # Escape angle brackets and wrap template tokens in backticks
escaped_line = ( escaped_line = line.strip().replace("<", "&lt;").replace(">", "&gt;")
line.strip().replace("<", "&lt;").replace(">", "&gt;")
)
if ("{" in escaped_line and "}" in escaped_line) or ( if ("{" in escaped_line and "}" in escaped_line) or (
"&lt;|" in escaped_line and "|&gt;" in escaped_line "&lt;|" in escaped_line and "|&gt;" in escaped_line
): ):
@ -309,19 +291,13 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
default = f"`{escaped_default}`" default = f"`{escaped_default}`"
else: else:
# Apply additional escaping for curly braces # Apply additional escaping for curly braces
default = escaped_default.replace("{", "&#123;").replace( default = escaped_default.replace("{", "&#123;").replace("}", "&#125;")
"}", "&#125;"
)
description_text = field_info["description"] or "" description_text = field_info["description"] or ""
# Escape curly braces in description text for MDX compatibility # Escape curly braces in description text for MDX compatibility
description_text = description_text.replace("{", "&#123;").replace( description_text = description_text.replace("{", "&#123;").replace("}", "&#125;")
"}", "&#125;"
)
md_lines.append( md_lines.append(f"| `{field_name}` | `{field_type}` | {required} | {default} | {description_text} |")
f"| `{field_name}` | `{field_type}` | {required} | {default} | {description_text} |"
)
md_lines.append("") md_lines.append("")
@ -364,9 +340,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
sample_config_dict = convert_pydantic_to_dict(sample_config) sample_config_dict = convert_pydantic_to_dict(sample_config)
# Strip trailing newlines from yaml.dump to prevent extra blank lines # Strip trailing newlines from yaml.dump to prevent extra blank lines
yaml_output = yaml.dump( yaml_output = yaml.dump(sample_config_dict, default_flow_style=False, sort_keys=False).rstrip()
sample_config_dict, default_flow_style=False, sort_keys=False
).rstrip()
md_lines.append(yaml_output) md_lines.append(yaml_output)
else: else:
md_lines.append("# No sample configuration available.") md_lines.append("# No sample configuration available.")
@ -374,10 +348,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
md_lines.append(f"# Error generating sample config: {str(e)}") md_lines.append(f"# Error generating sample config: {str(e)}")
md_lines.append("```") md_lines.append("```")
if ( if hasattr(provider_spec, "deprecation_warning") and provider_spec.deprecation_warning:
hasattr(provider_spec, "deprecation_warning")
and provider_spec.deprecation_warning
):
md_lines.append("## Deprecation Notice") md_lines.append("## Deprecation Notice")
md_lines.append("") md_lines.append("")
md_lines.append(":::warning") md_lines.append(":::warning")
@ -394,9 +365,7 @@ def generate_provider_docs(progress, provider_spec: Any, api_name: str) -> str:
return "\n".join(md_lines) + "\n" return "\n".join(md_lines) + "\n"
def generate_index_docs( def generate_index_docs(api_name: str, api_docstring: str | None, provider_entries: list) -> str:
api_name: str, api_docstring: str | None, provider_entries: list
) -> str:
"""Generate MDX documentation for the index file.""" """Generate MDX documentation for the index file."""
# Create sidebar label for the API # Create sidebar label for the API
sidebar_label = api_name.replace("_", " ").title() sidebar_label = api_name.replace("_", " ").title()
@ -432,9 +401,7 @@ def generate_index_docs(
md_lines.append(f"{cleaned_docstring}") md_lines.append(f"{cleaned_docstring}")
md_lines.append("") md_lines.append("")
md_lines.append( md_lines.append(f"This section contains documentation for all available providers for the **{api_name}** API.")
f"This section contains documentation for all available providers for the **{api_name}** API."
)
return "\n".join(md_lines) + "\n" return "\n".join(md_lines) + "\n"
@ -472,14 +439,10 @@ def process_provider_registry(progress, change_tracker: ChangedPathTracker) -> N
else: else:
display_name = display_name.title() display_name = display_name.title()
provider_entries.append( provider_entries.append({"filename": filename, "display_name": display_name})
{"filename": filename, "display_name": display_name}
)
# Generate index file with frontmatter # Generate index file with frontmatter
index_content = generate_index_docs( index_content = generate_index_docs(api_name, api_docstring, provider_entries)
api_name, api_docstring, provider_entries
)
index_file = doc_output_dir / "index.mdx" index_file = doc_output_dir / "index.mdx"
index_file.write_text(index_content) index_file.write_text(index_content)
change_tracker.add_paths(index_file) change_tracker.add_paths(index_file)