Skip to content
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

Jump to bottom

Fixing client_version error #547

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Fixing client_version error #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e001fff
Fixing client_version error
dristysrivastava Sep 13, 2024
f1ddc81
Fix for file
dristysrivastava Sep 13, 2024
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
2 changes: 1 addition & 1 deletion pebblo/app/api/req_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ReqDiscover(BaseModel):
framework: Framework
chains: Optional[List[ChainInfo]] = None
plugin_version: str
client_version: Framework
client_version: Optional[Framework] = None


class ReqLoaderDoc(BaseModel):
Expand Down
1 change: 1 addition & 0 deletions pebblo/app/models/db_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class AiBaseApp(BaseModel):
] = [] # list of policy id, title and other details
pebbloServerVersion: Optional[str] = None
pebbloClientVersion: Optional[str] = None
clientVersion: Optional[FrameworkInfo] = None
model_config = ConfigDict(arbitrary_types_allowed=True, use_enum_values=True)


Expand Down
10 changes: 6 additions & 4 deletions pebblo/app/service/discovery/discovery_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ def create_app_obj(
current_time = get_current_time()

metadata = Metadata(createdAt=current_time, modifiedAt=current_time)
client_version = FrameworkInfo(
name=self.data.get("client_version", {}).get("name"),
version=self.data.get("client_version", {}).get("version"),
)
client_version = None
if self.data.get("client_version"):
client_version = FrameworkInfo(
name=self.data.get("client_version", {}).get("name"),
version=self.data.get("client_version", {}).get("version"),
)
ai_app_obj = {
"metadata": metadata,
"description": self.data.get("description", "-"),
Expand Down
10 changes: 6 additions & 4 deletions pebblo/app/service/discovery_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ def _create_ai_apps_model(
createdAt=self._get_current_datetime(),
modifiedAt=self._get_current_datetime(),
)
client_version = FrameworkInfo(
name=self.data.get("client_version", {}).get("name"),
version=self.data.get("client_version", {}).get("version"),
)
client_version = None
if self.data.get("client_version"):
client_version = FrameworkInfo(
name=self.data.get("client_version", {}).get("name"),
version=self.data.get("client_version", {}).get("version"),
)
ai_apps_model = AiApp(
metadata=metadata,
name=self.data.get("name"),
Expand Down