test app.py with db ok

analysis_db.py

@@ -6,8 +6,19 @@ from draw_db import draw_lists, min_max_list, up_down_list
 from util.date_util import format_date
 
 
+def get_filename(file_obj):
+    return file_obj.name
+
+
+def read_db(db_file):
+    db_name = get_filename(db_file)
+    debug_print('read_db, db_name = ', db_name)
+    return read_section(db_name, 'tb_section', '')
+
+
 def read_section(db_name, tb_name='tb_section', section_id=''):
-    debug_print('read_db, db_name = ', db_name, ', tb_name = ', tb_name, ', section_id = ', section_id)
+    res_fig = None
+    debug_print('read_section, db_name = ', db_name, ', tb_name = ', tb_name, ', section_id = ', section_id)
     conn = sqlite3.connect(db_name)
 
     if not tb_name:
@@ -25,11 +36,12 @@ def read_section(db_name, tb_name='tb_section', section_id=''):
             section_end_date = section_row[2]
             print('section_id = ', section_id, ', section_date = ', format_date(section_date), ', section_end_date = ',
                   format_date(section_end_date))
-            read_sample(conn, section_id, tb_name)
+            res_fig = read_sample(conn, section_id, tb_name)
     else:
-        read_sample(conn, section_id, tb_name)
+        res_fig = read_sample(conn, section_id, tb_name)
 
     conn.close()
+    return res_fig
 
 
 def read_sample(conn, section_id, tb_name):
@@ -72,11 +84,14 @@ def read_sample(conn, section_id, tb_name):
             screen_list.append(screen)
 
         title_str = str(section_id) + ', ' + str(format_date(section_date)) + ', ' + str(format_date(section_end_date))
-        light_min = min(light_list)
-        light_max = max(light_list)
-        screen_list = min_max_list(screen_list, light_min, light_max)
-        screen_list = up_down_list(screen_list)
-        draw_lists(title_str, date_list, max=max_list, min=min_list, acc=acc_list, screen=screen_list, light=light_list)
+
+        if len(light_list) > 0:
+            light_min = min(light_list)
+            light_max = max(light_list)
+            screen_list = min_max_list(screen_list, light_min, light_max)
+            screen_list = up_down_list(screen_list)
+        return draw_lists(title_str, date_list, max=max_list, min=min_list, acc=acc_list, screen=screen_list,
+                          light=light_list)
 
 
 if __name__ == '__main__':

app.py

@@ -1,103 +1,24 @@
 import gradio as gr
-from test import predict_uri
-import sys
-import warnings
-from fastapi import FastAPI
-
-# ignore UserWarning
-warnings.simplefilter("ignore", UserWarning)
-
-# examples = [
-#     ['res/miaow_16k.wav'],
-#     ['res/snore/pro_snore 6bee45643b45af9b_a7a3bbe6ba79af5b25b19ad10a8d9421d0d5679b.wav'],
-#     ['res/snore/Snoring vs Sleep Apnea  - What the difference sounds like.mp4']
-# ]
-title = "yamnet test"
-description = "An audio event classifier trained on the AudioSet dataset to predict audio events from the AudioSet ontology."
-
-# # https://github.com/gradio-app/gradio/issues/2362
-# class Logger:
-#     def __init__(self, filename):
-#         self.terminal = sys.stdout
-#         self.log = open(filename, "w")
-#
-#     def write(self, message):
-#         self.terminal.write(message)
-#         self.log.write(message)
-#
-#     def flush(self):
-#         self.terminal.flush()
-#         self.log.flush()
-#
-#     def isatty(self):
-#         return False
-#
-#
-# sys.stdout = Logger("output.log")
-#
-#
-# def test(x):
-#     print("This is a test")
-#     print(f"Your function is running with input {x}...")
-#     return x
-#
-#
-# def read_logs():
-#     sys.stdout.flush()
-#     with open("output.log", "r") as f:
-#         return f.read()
-#
-#
-# with gr.Interface(predict_uri, inputs=gr.inputs.Audio(type="filepath"), outputs=["text", 'plot']) as demo:
-#     examples = examples,
-#     title = title,
-#     description = description,
-#     allow_flagging = 'never'
-#
-#     logs = gr.Textbox()
-#     demo.load(read_logs, None, logs, every=1)
-#
-# demo.launch(enable_queue=True, show_error=True)
-
-
-# with gr.Blocks() as demo:
-#     with gr.Row():
-#         inputs = gr.inputs.Audio(type="filepath")
-#         outputs = ["text", 'plot']
-#     btn = gr.Button("Run")
-#     btn.click(predict_uri, inputs, outputs)
-#
-#     logs = gr.Textbox()
-#     demo.load(read_logs, None, logs, every=1)
-#
-# demo.queue().launch()
-
-
-demo = gr.Interface(
-    predict_uri,
-    inputs=[
-        gr.inputs.Audio(type="filepath"),
-        gr.inputs.Audio(source="microphone", type="filepath"),
-        gr.Slider(minimum=7, maximum=21, step=1)
-    ],
-    outputs=['image', 'image', 'image', 'text', 'text', 'text', 'text'],
-    # examples=examples,
-    title=title,
-    description=description,
-    allow_flagging='never'
-)
-demo.launch(enable_queue=True, show_error=True, share=False)
-
-# # FastAPI
-# CUSTOM_PATH = "/gradio"
-#
-# app = FastAPI()
-#
-#
-# @app.get("/")
-# def read_main():
-#     return {"message": "This is your main app"}
-#
-#
-# io = gr.Interface(lambda x: "Hello, " + x + "!", "textbox", "textbox")
-# app = gr.mount_gradio_app(app, io, path=CUSTOM_PATH)
+import pandas as pd
+import seaborn as sns
+import matplotlib.pyplot as plt
+from analysis_db import read_db
+
+
+def plot_pens(alpha):
+    df_pens = pd.read_csv('https://raw.githubusercontent.com/mwaskom/seaborn-data/master/penguins.csv')
+    fig = plt.figure()
+    plt.scatter(x=df_pens['bill_length_mm'], y=df_pens['bill_depth_mm'])
+    return fig
+
+
+iface = gr.Interface(
+    fn=read_db,
+    layout='vertical',
+    inputs=['file'],
+    outputs=['plot'],
+    title="Sleep Data test",
+    description="Let's talk pens.",
+    article="Talk more about Penguins here, shall we?",
+    theme='peach'
+).launch()

draw_db.py

@@ -2,6 +2,7 @@ import math
 
 import matplotlib.pyplot as plt
 
+from util.debug import DEBUG
 from util.debug import debug_print
 
 
@@ -24,8 +25,7 @@ def min_max_list(src_list, tar_min, tar_max):
 
 
 def draw_lists(title='', date_list=None, **kv_list):
-    debug_print('draw_three, date_list = ', str(date_list))
-    # debug_print('draw_three, light_list = ', str(light_list))
+    debug_print('draw_lists, date_list = ', str(date_list))
 
     idx_list = 0
     idx_axs = 0
@@ -38,8 +38,15 @@ def draw_lists(title='', date_list=None, **kv_list):
         idx_list = idx_list + 1
         idx_axs = int(idx_list / 3)
 
-    if debug.DEBUG:
-        plt.show()
+    plt.gcf().autofmt_xdate()
+    # plt.title(title)
+
+    if DEBUG:
+        # plt.show()
+        file_uri = '.doc/' + title + '.png'
+        fig.savefig(file_uri)
     else:
         file_uri = '.doc/' + title + '.png'
         fig.savefig(file_uri)
+
+    return fig

requirements.txt

@@ -1,11 +1,6 @@
-Pillow
-librosa
-soundfile
-matplotlib==3.7.2
 gradio
-tensorflow
-tensorflow_hub
+matplotlib==3.7.2
 numpy
 scipy
-pydub
-seaborn
+pandas
+sqlite3