Update app.py
Browse files
app.py
CHANGED
@@ -28,10 +28,9 @@ class Config:
|
|
28 |
repo_path: Path = Path("./transformers.js")
|
29 |
|
30 |
@classmethod
|
31 |
-
def from_env(cls) -> "Config":
|
32 |
"""Create config from environment variables and secrets."""
|
33 |
system_token = os.getenv("HF_TOKEN")
|
34 |
-
user_token = gr.session_state.get("user_hf_token")
|
35 |
if user_token:
|
36 |
hf_username = whoami(token=user_token)["name"]
|
37 |
else:
|
@@ -148,29 +147,22 @@ class ModelConverter:
|
|
148 |
def convert_and_upload_model(input_model_id: str, user_hf_token: str = None):
|
149 |
"""Function to handle model conversion and upload."""
|
150 |
try:
|
151 |
-
config = Config.from_env()
|
152 |
-
if user_hf_token:
|
153 |
-
gr.session_state["user_hf_token"] = user_hf_token
|
154 |
-
config = Config.from_env()
|
155 |
-
|
156 |
converter = ModelConverter(config)
|
157 |
converter.setup_repository()
|
158 |
|
159 |
if converter.api.repo_exists(input_model_id):
|
160 |
-
with gr.
|
|
|
161 |
success, stderr = converter.convert_model(input_model_id)
|
162 |
if not success:
|
163 |
return f"Conversion failed: {stderr}"
|
164 |
|
165 |
-
|
166 |
-
gr.Code(stderr)
|
167 |
-
|
168 |
-
with gr.spinner("Uploading model..."):
|
169 |
error = converter.upload_model(input_model_id)
|
170 |
if error:
|
171 |
return f"Upload failed: {error}"
|
172 |
|
173 |
-
gr.Info("Upload successful!")
|
174 |
return f"Model uploaded to {input_model_id}/onnx"
|
175 |
else:
|
176 |
return f"Model {input_model_id} does not exist on Hugging Face."
|
|
|
28 |
repo_path: Path = Path("./transformers.js")
|
29 |
|
30 |
@classmethod
|
31 |
+
def from_env(cls, user_token: Optional[str] = None) -> "Config":
|
32 |
"""Create config from environment variables and secrets."""
|
33 |
system_token = os.getenv("HF_TOKEN")
|
|
|
34 |
if user_token:
|
35 |
hf_username = whoami(token=user_token)["name"]
|
36 |
else:
|
|
|
147 |
def convert_and_upload_model(input_model_id: str, user_hf_token: str = None):
|
148 |
"""Function to handle model conversion and upload."""
|
149 |
try:
|
150 |
+
config = Config.from_env(user_hf_token)
|
|
|
|
|
|
|
|
|
151 |
converter = ModelConverter(config)
|
152 |
converter.setup_repository()
|
153 |
|
154 |
if converter.api.repo_exists(input_model_id):
|
155 |
+
with gr.Progress() as progress:
|
156 |
+
progress(0, desc="Converting model...")
|
157 |
success, stderr = converter.convert_model(input_model_id)
|
158 |
if not success:
|
159 |
return f"Conversion failed: {stderr}"
|
160 |
|
161 |
+
progress(0.5, desc="Uploading model...")
|
|
|
|
|
|
|
162 |
error = converter.upload_model(input_model_id)
|
163 |
if error:
|
164 |
return f"Upload failed: {error}"
|
165 |
|
|
|
166 |
return f"Model uploaded to {input_model_id}/onnx"
|
167 |
else:
|
168 |
return f"Model {input_model_id} does not exist on Hugging Face."
|