From 9131567257245c81f42c5906165185128bb3dce1 Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Thu, 1 Jun 2023 00:08:09 -0700
Subject: [PATCH] chore: migrate completion to new metadata format (#179)

---
 crates/tabby/src/serve/completions.rs |  8 +-------
 crates/tabby/src/serve/mod.rs         | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/crates/tabby/src/serve/completions.rs b/crates/tabby/src/serve/completions.rs
index 6e1f9dc..46d79ea 100644
--- a/crates/tabby/src/serve/completions.rs
+++ b/crates/tabby/src/serve/completions.rs
@@ -86,7 +86,7 @@ impl CompletionState {
             .model_path(model_dir.ctranslate2_dir())
             .tokenizer_path(model_dir.tokenizer_file())
             .device(device)
-            .model_type(metadata.transformers_info.auto_model)
+            .model_type(metadata.auto_model)
             .device_indices(args.device_indices.clone())
             .num_replicas_per_device(args.num_replicas_per_device)
             .build()
@@ -105,13 +105,7 @@ fn get_model_dir(model: &str) -> ModelDir {
 }
 
 #[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
 struct Metadata {
-    transformers_info: TransformersInfo,
-}
-
-#[derive(Deserialize)]
-struct TransformersInfo {
     auto_model: String,
 }
 
diff --git a/crates/tabby/src/serve/mod.rs b/crates/tabby/src/serve/mod.rs
index 06032fd..e9b6a22 100644
--- a/crates/tabby/src/serve/mod.rs
+++ b/crates/tabby/src/serve/mod.rs
@@ -3,9 +3,9 @@ mod completions;
 mod events;
 
 use crate::Cli;
+use anyhow::Result;
 use axum::{routing, Router, Server};
 use clap::{error::ErrorKind, Args, CommandFactory};
-use hyper::Error;
 use std::{
     net::{Ipv4Addr, SocketAddr},
     sync::Arc,
@@ -61,8 +61,8 @@ pub struct ServeArgs {
     experimental_admin_panel: bool,
 }
 
-pub async fn main(args: &ServeArgs) -> Result<(), Error> {
-    valid_args(args);
+pub async fn main(args: &ServeArgs) -> Result<()> {
+    valid_args(args)?;
     let app = Router::new()
         .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
         .nest("/v1", api_router(args))
@@ -71,7 +71,10 @@ pub async fn main(args: &ServeArgs) -> Result<(), Error> {
 
     let address = SocketAddr::from((Ipv4Addr::UNSPECIFIED, args.port));
     println!("Listening at {}", address);
-    Server::bind(&address).serve(app.into_make_service()).await
+    Server::bind(&address)
+        .serve(app.into_make_service())
+        .await?;
+    Ok(())
 }
 
 fn api_router(args: &ServeArgs) -> Router {
@@ -92,7 +95,7 @@ fn fallback(experimental_admin_panel: bool) -> routing::MethodRouter {
     }
 }
 
-fn valid_args(args: &ServeArgs) {
+fn valid_args(args: &ServeArgs) -> Result<()> {
     if args.device == Device::CUDA && args.num_replicas_per_device != 1 {
         Cli::command()
             .error(
@@ -111,4 +114,6 @@ fn valid_args(args: &ServeArgs) {
             )
             .exit();
     }
+
+    Ok(())
 }