test

controllers/gra_03_programfromdoc/programfromdoc.py

@@ -8,75 +8,10 @@ import psycopg2
 from dataclasses import dataclass, field
 from typing import List, Optional
 from mysite.interpreter.process import no_process_file,process_file
-from controllers.gra_04_database.rides import test_set_lide
+#from controllers.gra_04_database.rides import test_set_lide
 
-@dataclass
-class Ride:
-    ride_id: Optional[int] = field(default=None)
-    rideable_type: str = ''
-    start_station_id: int = 0
-    start_station_name: str = ''
-    end_station_id: int = 0
-    end_station_name: str = ''
-    started_at: str = ''
-    ended_at: str = ''
-    member_casual: str = ''
 
-def connect_to_db():
-    conn = psycopg2.connect(
-        dbname="neondb",
-        user="miyataken999",
-        password="yz1wPf4KrWTm",
-        host="ep-odd-mode-93794521.us-east-2.aws.neon.tech",
-        port=5432,
-        sslmode="require"
-    )
-    return conn
 
-def create_ride(ride: Ride):
-    conn = connect_to_db()
-    cur = conn.cursor()
-    cur.execute("INSERT INTO rides (rideable_type, start_station_id, start_station_name, end_station_id, end_station_name, started_at, ended_at, member_casual) VALUES (%s, %s, %s, %s, %s, %s, %s, %s) RETURNING ride_id",
-               (ride.rideable_type, ride.start_station_id, ride.start_station_name, ride.end_station_id, ride.end_station_name, ride.started_at, ride.ended_at, ride.member_casual))
-    ride_id = cur.fetchone()[0]
-    conn.commit()
-    cur.close()
-    conn.close()
-    return ride_id
-
-def read_rides():
-    conn = connect_to_db()
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM rides")
-    rides = cur.fetchall()
-    conn.close()
-    return rides
-
-def read_ride(ride_id: int):
-    conn = connect_to_db()
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM rides WHERE ride_id = %s", (ride_id,))
-    ride = cur.fetchone()
-    conn.close()
-    return ride
-
-def update_ride(ride: Ride):
-    conn = connect_to_db()
-    cur = conn.cursor()
-    no_process_file(ride.start_station_name,ride.end_station_name)
-    cur.execute("UPDATE rides SET rideable_type = %s, start_station_id = %s, start_station_name = %s, end_station_id = %s, end_station_name = %s, started_at = %s, ended_at = %s, member_casual = %s WHERE ride_id = %s",
-               (ride.rideable_type, ride.start_station_id, ride.start_station_name, ride.end_station_id, ride.end_station_name, ride.started_at, ride.ended_at, ride.member_casual, ride.ride_id))
-    conn.commit()
-    cur.close()
-    conn.close()
-
-def delete_ride(ride_id: int):
-    conn = connect_to_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM rides WHERE ride_id = %s", (ride_id,))
-    conn.commit()
-    cur.close()
-    conn.close()
 
 gradio_interface = gr.Interface(
     fn=process_file,

models/ride.py

@@ -7,8 +7,8 @@ import gradio as gr
 import psycopg2
 from dataclasses import dataclass, field
 from typing import List, Optional
-from mysite.interpreter.process import no_process_file,process_file
-from controllers.gra_04_database.rides import test_set_lide
+#from mysite.interpreter.process import no_process_file,process_file
+#from controllers.gra_04_database.rides import test_set_lide
 
 @dataclass
 class Ride:
@@ -76,4 +76,13 @@ def delete_ride(ride_id: int):
     cur.execute("DELETE FROM rides WHERE ride_id = %s", (ride_id,))
     conn.commit()
     cur.close()
-    conn.close()
+    conn.close()
+
+def test_set_lide(input="test",foldername="test"):
+    ride = Ride(
+        rideable_type="rideable_type",
+        start_station_name=input,
+        end_station_name=foldername,
+    )
+    create_ride(ride)
+    return [[r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8]] for r in read_rides()]

mysite/interpreter/process.py

@@ -9,6 +9,7 @@ from mysite.libs.logger import logger
 import async_timeout
 import asyncio
 import mysite.interpreter.interpreter_config 
+from models.ride import test_set_lide
 
 GENERATION_TIMEOUT_SEC=60
 BASE_PATH = "/home/user/app/controllers/"
@@ -86,6 +87,8 @@ def process_file(fileobj, prompt, foldername):
     except Exception as e:
         return f"Error writing prompt to file: {str(e)}"
     time.sleep(1)
+    #foldernameの登録
+    test_set_lide(prompt,foldername)
     try:
         proc = subprocess.Popen(
             ["make", "run", foldername],