remove logging and simplify structure

modules/app.py → app.py

@@ -9,10 +9,6 @@ import pprint
 from huggingface_hub import Repository
 from text_generation import Client
 
-import logging
-logging.basicConfig(level=logging.INFO)
-import modules.cloud_logging
-
 # from flask import Flask, request, render_template
 # from flask_cors import CORS
 # app = Flask(__name__, static_folder='static')
@@ -80,8 +76,6 @@ def generate(prefix, suffix=None, temperature=0.9, max_new_tokens=256, top_p=0.9
     
     if suffix is not None:
         prompt = f"{FIM_PREFIX}{prefix}{FIM_SUFFIX}{suffix}{FIM_MIDDLE}"
-        print("----prompt----")
-        print(prompt)
     else:
         prompt = prefix
     output = client.generate(prompt, **generate_kwargs)
@@ -117,11 +111,6 @@ async def generate_maybe(info: str):
     prompt = form['prompt']
     length_limit = int(form['length'])
     temperature = float(form['temperature'])
-    logging.info(json.dumps({
-        'length': length_limit,
-        'temperature': temperature,
-        'prompt': prompt,
-    }))
     try:
         generation = generate(prompt, temperature=temperature, max_new_tokens=length_limit, top_p=0.95, repetition_penalty=1.0)
         if generation['truncated']:
@@ -131,7 +120,6 @@ async def generate_maybe(info: str):
         return {'result': 'success', 'type': 'generate', 'prompt': prompt, 'text': generation['text'], 'message': message}
     except Exception as e:
         traceback.print_exception(*sys.exc_info())
-        logging.error(e)
         return {'result': 'error', 'type': 'generate', 'prompt': prompt, 'message': f'Error: {e}.'}
 
 @app.get('/infill')
@@ -147,11 +135,6 @@ async def infill_maybe(info: str):
     temperature = float(form['temperature'])
     max_retries = 1
     extra_sentinel = True
-    logging.info(json.dumps({
-        'length': length_limit,
-        'temperature': temperature,
-        'parts_joined': '<infill>'.join(form['parts']),
-    }))
     try:
         if len(form['parts']) > 2:
             return {'result': 'error', 'text': ''.join(form['parts']), 'type': 'infill', 'message': f"error: Only a single infill is supported!"}
@@ -166,7 +149,6 @@ async def infill_maybe(info: str):
         # return {'result': 'success', 'prefix': prefix, 'suffix': suffix,  'text': generation['text']}
     except Exception as e:
         traceback.print_exception(*sys.exc_info())
-        logging.error(e)
         return {'result': 'error', 'type': 'infill', 'message': f'Error: {e}.'}
 
 

modules/cloud_logging.py

@@ -1,21 +0,0 @@
-import os
-def make_logging_client():
-    cred_filename = os.environ.get('GOOGLE_APPLICATION_CREDENTIALS')
-    if not cred_filename:
-        return None
-    print("cred filename:", cred_filename)
-    cred_string = os.environ.get('GOOGLE_APPLICATION_CREDENTIALS_STRING')
-    print("cred string:", bool(cred_string))
-    if not os.path.exists(cred_filename):
-        if cred_string:
-            print(f"writing cred string to {cred_filename}")
-            with open(cred_filename, 'w') as f:
-                f.write(cred_string)
-        else:
-            return None
-    from google.cloud import logging
-    logging_client = logging.Client()
-    logging_client.setup_logging()
-    return logging_client
-
-logging_client = make_logging_client()

start.py

@@ -1,3 +1,3 @@
 import subprocess
 
-subprocess.run("uvicorn modules.app:app --timeout-keep-alive 300 --host 0.0.0.0 --port 7860", shell=True)
+subprocess.run("uvicorn app:app --timeout-keep-alive 300 --host 0.0.0.0 --port 7860", shell=True)