refactor schemas package

utils/convert_alta_to_adex_cache.py → dev_scripts/convert_alta_to_adex_cache.py

@@ -4,7 +4,8 @@
 import psycopg2
 from psycopg2 import Error
 import argparse
-from utils.sql_scripts import select_from_alta, insert_into_skyview
+
+from schemas import sql_scripts
 
 def parse_database_url(url):
     # parse database url like: postgres:postgres@localhost/altadb_1sept2022:5432
@@ -47,16 +48,20 @@ def do_convert(source, target):
         )
 
         source_cursor = source_connection.cursor()
-        source_cursor.execute(select_from_alta)
+        source_cursor.execute(sql_scripts.select_from_alta)
 
         target_cursor = target_connection.cursor()
 
+
+        print('fetching records from ALTA...')
         rows = source_cursor.fetchall()
+        count = len(rows)
+        print(str(count) + ' records fetched')
         for row in rows:
             print(row)
             access_url,ra,dec,dt,dst,observation = row
             record_to_insert = (observation, observation, ra, dec, "alta",0, dt,dst, access_url)
-            target_cursor.execute(insert_into_skyview,record_to_insert)
+            target_cursor.execute(sql_scripts.insert_into_skyviews,record_to_insert)
             target_connection.commit()
 
     except Error as e:

requirements.txt

@@ -5,7 +5,6 @@ colorama==0.4.5
 databases==0.6.1
 fastapi==0.79.0
 greenlet==1.1.2
-gunicorn==20.1.0
 h11==0.13.0
 idna==3.3
 pydantic==1.9.2

utils/sql_scripts.py → schemas/sql_scripts.py

@@ -6,7 +6,7 @@ CREATE DATABASE adex_cache
     CONNECTION LIMIT = -1;
 """
 
-create_table = """
+create_table_skyviews = """
 CREATE TABLE public.skyviews
 (
     "id" SERIAL,
@@ -24,7 +24,7 @@ CREATE TABLE public.skyviews
 """
 
 
-insert_into_skyview = """
+insert_into_skyviews = """
 INSERT INTO public.skyviews
 (
     title,