Update app.py

app.py

@@ -50,7 +50,6 @@ class S3DirectStream:
         )
         self.bucket_name = bucket_name
 
-
     def stream_from_s3(self, key):
         try:
             logger.info(f"Downloading {key} from S3...")
@@ -73,7 +72,6 @@ class S3DirectStream:
     def load_model_from_stream(self, model_prefix, revision):
         try:
             logger.info(f"Loading model {model_prefix} (revision {revision})...")
-
             if self.file_exists_in_s3(f"{model_prefix}/config.json") and \
                (self.file_exists_in_s3(f"{model_prefix}/pytorch_model.bin") or self.file_exists_in_s3(f"{model_prefix}/model.safetensors")):
                 logger.info(f"Model {model_prefix} found in S3. Loading...")
@@ -87,22 +85,19 @@ class S3DirectStream:
             logger.error(f"Error loading model: {e}")
             return None
 
-
     def load_model_from_existing_s3(self, model_prefix):
         logger.info(f"Loading config for {model_prefix} from S3...")
         config_stream = self.stream_from_s3(f"{model_prefix}/config.json")
         config_dict = json.load(config_stream)
-        config = AutoConfig.from_pretrained(config_dict)
+        config = AutoConfig.from_dict(config_dict)
         logger.info(f"Config loaded for {model_prefix}.")
 
-
         if self.file_exists_in_s3(f"{model_prefix}/model.safetensors"):
             logger.info(f"Loading safetensors model for {model_prefix} from S3...")
             model_stream = self.stream_from_s3(f"{model_prefix}/model.safetensors")
             model = AutoModelForCausalLM.from_config(config)
             model.load_state_dict(safetensors.torch.load_stream(model_stream))
             logger.info(f"Safetensors model loaded for {model_prefix}.")
-
         elif self.file_exists_in_s3(f"{model_prefix}/pytorch_model.bin"):
             logger.info(f"Loading PyTorch model for {model_prefix} from S3...")
             model_stream = self.stream_from_s3(f"{model_prefix}/pytorch_model.bin")
@@ -113,17 +108,14 @@ class S3DirectStream:
         else:
             logger.error(f"No model file found for {model_prefix} in S3")
             raise EnvironmentError(f"No model file found for {model_prefix} in S3")
-
         return model
 
     def load_tokenizer_from_stream(self, model_prefix):
         try:
             logger.info(f"Loading tokenizer for {model_prefix}...")
-
             if self.file_exists_in_s3(f"{model_prefix}/tokenizer.json"):
                 logger.info(f"Tokenizer for {model_prefix} found in S3. Loading...")
-                return self.load_tokenizer_from_existing_s3(model_prefix)
-
+                return self.load_tokenizer_from_existing_s3(model_prefix, config) # Pass config
 
             logger.info(f"Tokenizer for {model_prefix} not found in S3. Downloading and uploading...")
             self.download_and_upload_to_s3(model_prefix)
@@ -134,23 +126,21 @@ class S3DirectStream:
             return None
 
 
-    def load_tokenizer_from_existing_s3(self, model_prefix):
+    def load_tokenizer_from_existing_s3(self, model_prefix, config): # Recieve config
         logger.info(f"Loading tokenizer from S3 for {model_prefix}...")
+
         tokenizer_stream = self.stream_from_s3(f"{model_prefix}/tokenizer.json")
-        tokenizer_config = json.load(tokenizer_stream) # Corrected this line
-        tokenizer = AutoTokenizer.from_pretrained(pretrained_model_name_or_path=None, config=tokenizer_config) # Corrected this line
+        tokenizer = AutoTokenizer.from_pretrained(None, config=config) # Use config
         logger.info(f"Tokenizer loaded for {model_prefix}.")
         return tokenizer
 
 
-
     def download_and_upload_to_s3(self, model_prefix, revision="main"):
         model_url = f"https://huggingface.co/{model_prefix}/resolve/{revision}/pytorch_model.bin"
         safetensors_url = f"https://huggingface.co/{model_prefix}/resolve/{revision}/model.safetensors"
         tokenizer_url = f"https://huggingface.co/{model_prefix}/resolve/{revision}/tokenizer.json"
         config_url = f"https://huggingface.co/{model_prefix}/resolve/{revision}/config.json"
 
-
         logger.info(f"Downloading and uploading model files for {model_prefix} to S3...")
         self.download_and_upload_to_s3_url(model_url, f"{model_prefix}/pytorch_model.bin")
         self.download_and_upload_to_s3_url(safetensors_url, f"{model_prefix}/model.safetensors")
@@ -158,23 +148,22 @@ class S3DirectStream:
         self.download_and_upload_to_s3_url(config_url, f"{model_prefix}/config.json")
         logger.info(f"Finished downloading and uploading model files for {model_prefix}.")
 
+
     def download_and_upload_to_s3_url(self, url, s3_key):
         logger.info(f"Downloading from {url}...")
-
         with requests.get(url, stream=True) as response:
             if response.status_code == 200:
-                total_size_in_bytes= int(response.headers.get('content-length', 0))
+                total_size_in_bytes = int(response.headers.get('content-length', 0))
                 block_size = 1024
                 progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
                 logger.info(f"Uploading to S3: {s3_key}...")
-
                 self.s3_client.upload_fileobj(response.raw, self.bucket_name, s3_key, Callback=lambda bytes_transferred: progress_bar.update(bytes_transferred))
                 progress_bar.close()
                 logger.info(f"Uploaded {s3_key} to S3 successfully.")
-
             elif response.status_code == 404:
                 logger.error(f"File not found at {url}")
                 raise HTTPException(status_code=404, detail=f"Error downloading file from {url}. File not found.")
+
             else:
                 logger.error(f"Error downloading from {url}: Status code {response.status_code}")
                 raise HTTPException(status_code=500, detail=f"Error downloading file from {url}")
@@ -184,23 +173,19 @@ class S3DirectStream:
 async def predict(model_request: DownloadModelRequest):
     try:
         logger.info(f"Received request: Model={model_request.model_name}, Task={model_request.pipeline_task}, Input={model_request.input_text}")
-
         model_name = model_request.model_name
         revision = model_request.revision
 
         streamer = S3DirectStream(S3_BUCKET_NAME)
         logger.info("Loading model and tokenizer...")
         model = streamer.load_model_from_stream(model_name, revision)
-
-        tokenizer = streamer.load_tokenizer_from_stream(model_name)
+        tokenizer = streamer.load_tokenizer_from_stream(model_name)  # Moved after model loading
         logger.info("Model and tokenizer loaded.")
 
-
         task = model_request.pipeline_task
         if task not in ["text-generation", "sentiment-analysis", "translation", "fill-mask", "question-answering",  "summarization", "zero-shot-classification"]:
             raise HTTPException(status_code=400, detail="Unsupported pipeline task")
 
-
         if task == "text-generation":
             logger.info("Starting text generation...")
             text_streamer = TextIteratorStreamer(tokenizer, skip_prompt=True, skip_special_tokens=True)
@@ -208,7 +193,6 @@ async def predict(model_request: DownloadModelRequest):
             generation_kwargs = dict(inputs, streamer=text_streamer)
             model.generate(**generation_kwargs)
             logger.info("Text generation finished.")
-
             return StreamingResponse(iter([tokenizer.decode(token) for token in text_streamer]), media_type="text/event-stream")
 
         else:
@@ -218,13 +202,10 @@ async def predict(model_request: DownloadModelRequest):
             logger.info(f"Pipeline task {task} finished.")
             return {"result": outputs}
 
-
-
     except Exception as e:
         logger.exception(f"Error processing request: {e}")
         raise HTTPException(status_code=500, detail=f"Error processing request: {str(e)}")
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)