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.

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

Feat/release 1 17 #316

Merged
merged 19 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 bizyair_frontend
Submodule bizyair_frontend updated 33 files
+5 −0 src/api/model.ts
+9 −0 src/components/community/Index.vue
+31 −170 src/components/community/MainContent.vue
+93 −387 src/components/community/Mine.vue
+30 −183 src/components/community/QuickStartContent.vue
+4 −4 src/components/community/Sidebar.vue
+32 −185 src/components/community/WorkflowsContent.vue
+628 −516 src/components/community/detail/Index.vue
+1 −22 src/components/community/modules/BaseModelGrid.vue
+13 −5 src/components/community/modules/MineTabs.vue
+86 −120 src/components/community/modules/ModelCard.vue
+7 −2 src/components/community/modules/ModelFilterBar.vue
+9 −1 src/components/community/modules/NewPostButton.vue
+0 −750 src/components/model-detail/Index.vue
+0 −1 src/components/model-detail/index.ts
+45 −196 src/components/model-select/Index.vue
+204 −0 src/components/model-select/Mine.vue
+0 −79 src/components/model-select/ModelPagination.vue
+0 −252 src/components/model-select/ModelTable.vue
+0 −106 src/components/model-select/ModelVersionRow.vue
+943 −0 src/components/model-select/detail/Index.vue
+3 −4 src/components/model-select/index.ts
+310 −0 src/components/model-select/modules/BaseModelGrid.vue
+66 −0 src/components/model-select/modules/MineTabs.vue
+266 −0 src/components/model-select/modules/ModelCard.vue
+84 −78 src/components/model-select/modules/ModelFilterBar.vue
+145 −0 src/composables/useModelGrid.ts
+11 −3 src/stores/communityStore.ts
+212 −0 src/stores/modelSelectStore.ts
+30 −0 src/types/grid.ts
+2 −0 src/types/model.d.ts
+1 −1 tsconfig.app.tsbuildinfo
+62 −0 vite.config.ts.timestamp-1737709531912-114df29bcefc9.mjs
869 changes: 515 additions & 354 deletions js/bizyair_frontend.js

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions src/bizy_server/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,25 @@ async def fork_model_version(self, version_id: int) -> tuple[None, ErrorNo | Non
print(f"\033[31m[BizyAir]\033[0m Fail to fork model version: {str(e)}")
return None, errnos.FORK_MODEL_VERSION

async def unfork_model_version(
self, version_id: int
) -> tuple[None, ErrorNo | None]:
server_url = f"{BIZYAIR_SERVER_ADDRESS}/bizy_models/versions/{version_id}/fork"

headers, err = self.auth_header()
if err is not None:
return None, err

try:
ret, err = await self.do_delete(server_url, headers=headers)
if err is not None:
return None, err

return None, None
except Exception as e:
print(f"\033[31m[BizyAir]\033[0m Fail to unfork model version: {str(e)}")
return None, errnos.UNFORK_MODEL_VERSION

async def update_model(
self, model_id: int, name: str, type_: str, versions: list[dict]
) -> tuple[dict | None, ErrorNo | None]:
Expand Down
1 change: 1 addition & 0 deletions src/bizy_server/errno.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,4 @@ class errnos:
QUERY_OFFICIAL_MODELS = ErrorNo(
500, 500129, None, "Failed to query official models"
)
UNFORK_MODEL_VERSION = ErrorNo(500, 500130, None, "Failed to unfork model version")
23 changes: 23 additions & 0 deletions src/bizy_server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,29 @@ async def fork_model_version(request):
print(f"\033[31m[BizyAir]\033[0m Fail to fork model version: {str(e)}")
return ErrResponse(errnos.FORK_MODEL_VERSION)

@self.prompt_server.routes.delete(
f"/{COMMUNITY_API}/models/fork/{{model_version_id}}"
)
async def unfork_model_version(request):
try:
# 获取version_id参数
version_id = request.match_info["model_version_id"]
if not version_id:
return ErrResponse(errnos.INVALID_MODEL_VERSION_ID)

# 调用API fork模型版本
_, err = await self.api_client.unfork_model_version(version_id)
if err:
return ErrResponse(err)

return OKResponse(None)

except Exception as e:
print(
f"\033[31m[BizyAir]\033[0m Fail to unfork model version: {str(e)}"
)
return ErrResponse(errnos.FORK_MODEL_VERSION)

@self.prompt_server.routes.post(
f"/{COMMUNITY_API}/models/like/{{model_version_id}}"
)
Expand Down
Loading