phoenix-oss/llama-stack
1
0
Fork 0
forked from phoenix-oss/llama-stack-mirror
Code Pull requests Releases Packages 2 Activity Actions

remove pydantic namespace warnings using model_config (#470)

Browse source 
# What does this PR do?

remove another model_ pydantic namespace warning and convert old-style
'class Config' to new-style 'model_config' workaround.

also a whitespace change to get past -


flake8...................................................................Failed
llama_stack/cli/download.py:296:85: E226 missing whitespace around
arithmetic operator
llama_stack/cli/download.py:297:54: E226 missing whitespace around
arithmetic operator


## Before submitting

- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [x] Ran pre-commit to handle lint / formatting issues.
- [x] Read the [contributor
guideline](https://github.com/meta-llama/llama-stack/blob/main/CONTRIBUTING.md),
      Pull Request section?
- [ ] Updated relevant documentation.
- [x] Wrote necessary unit or integration tests.
This commit is contained in:
Matthew Farrellee 2024-11-18 22:24:14 -05:00 • committed by GitHub
parent 2108a779f2
commit fcc2132e6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llama_stack/apis/models/models.py
View file

@ -31,6 +31,8 @@ class Model(CommonModelFields, Resource):
def provider_model_id(self) -> str: def provider_model_id(self) -> str:
return self.provider_resource_id return self.provider_resource_id
model_config = ConfigDict(protected_namespaces=())
class ModelInput(CommonModelFields): class ModelInput(CommonModelFields):
model_id: str model_id: str

9
llama_stack/cli/download.py
View file

@ -19,7 +19,7 @@ import httpx
from llama_models.datatypes import Model from llama_models.datatypes import Model
from llama_models.sku_list import LlamaDownloadInfo from llama_models.sku_list import LlamaDownloadInfo
from pydantic import BaseModel from pydantic import BaseModel, ConfigDict
from rich.console import Console from rich.console import Console
from rich.progress import ( from rich.progress import (
@ -293,8 +293,8 @@ class ParallelDownloader:
if free_space < required_space: if free_space < required_space:
self.console.print( self.console.print(
f"[red]Not enough disk space. Required: {required_space // (1024*1024)} MB, " f"[red]Not enough disk space. Required: {required_space // (1024 * 1024)} MB, "
f"Available: {free_space // (1024*1024)} MB[/red]" f"Available: {free_space // (1024 * 1024)} MB[/red]"
) )
return False return False
return True return True
@ -413,8 +413,7 @@ class ModelEntry(BaseModel):
model_id: str model_id: str
files: Dict[str, str] files: Dict[str, str]
class Config: model_config = ConfigDict(protected_namespaces=())
protected_namespaces = ()
class Manifest(BaseModel): class Manifest(BaseModel):