changed project structure

11 files changed, 32 insertions, 44 deletions

diff --git a/database_creation_script.py b/__dbscripts__/database_creation_script.py
index bfc2ae5..c0e9252 100644
--- a/database_creation_script.py
+++ b/__dbscripts__/database_creation_script.py
@@ -38,7 +38,7 @@ def execute_sql_statement(sql_statement, conn):
 
     return rows
 
-df=pd.read_csv("GlobalLandTemperaturesByCity.csv")
+df=pd.read_csv("..GlobalLandTemperaturesByCity.csv")
 data=df[df.dt>"1949-12-31"]
 data_for_loc_table=data[['City','Latitude','Longitude']]
 data_for_loc_table=data_for_loc_table.to_records(index=False)
diff --git a/dbcreation.ipynb b/__dbscripts__/dbcreation.ipynb
index f847fab..d4f34d1 100644
--- a/dbcreation.ipynb
+++ b/__dbscripts__/dbcreation.ipynb
@@ -84,7 +84,7 @@
    "source": [
     "# Read the Non-Normalized Data\n",
     "\n",
-    "df=pd.read_csv(\"GlobalLandTemperaturesByCity.csv\")\n",
+    "df=pd.read_csv(\"..GlobalLandTemperaturesByCity.csv\")\n",
     "data=df[df.dt>\"1949-12-31\"]\n",
     "    "
    ]
diff --git a/app/main.py b/app/main.py
deleted file mode 100644
index c2308f9..0000000
--- a/app/main.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from flask import Flask, render_template
-from flask import Markup
-import sqlite3 as sql
-import pandas as pd
-
-app = Flask(__name__)
-
-
-def execute_sql_statement(sql_statement, conn):
-    cur = conn.cursor()
-    cur.execute(sql_statement)
-    rows = cur.fetchall()
-    return rows
-
-def get_list_of_dict(keys, list_of_tuples):
-     list_of_dict = [dict(zip(keys, values)) for values in list_of_tuples]
-     return list_of_dict
-
-def get_cities_list():
-    conn = sql.connect("database.db")
-    sql_statement = 'SELECT DISTINCT(City_Name) as City_Name, Lat, Long FROM City_table join Loc_Table on City_Table.City_Id = Loc_table.City_Id'
-    df=pd.read_sql_query(sql_statement, conn).to_records(index=False)
-    return df
-
[email protected]("/")
[email protected]("/index")
-def index():
-
-    cities_list = get_cities_list()
-    keys = ("city", "latitude", "longitude")
-    cities_list = get_list_of_dict(keys, cities_list)
-    return render_template("index.html", cities_list=cities_list)
\ No newline at end of file
diff --git a/functions/array_functions.py b/functions/array_functions.py
new file mode 100644
index 0000000..be15abd
--- /dev/null
+++ b/functions/array_functions.py
@@ -0,0 +1,3 @@
+def get_list_of_dict(keys, list_of_tuples):
+    list_of_dict = [dict(zip(keys, values)) for values in list_of_tuples]
+    return list_of_dict
diff --git a/sql_functions.py b/functions/sql_functions.py
index 54d1d05..5cc2ae9 100644
--- a/sql_functions.py
+++ b/functions/sql_functions.py
@@ -14,8 +14,3 @@ def run_sql_pandas(sql_statement):
     conn = sql.connect("database.db")
     df = pd.read_sql_query(sql_statement, conn).to_records(index=False)
     return df
-
-
-def get_list_of_dict(keys, list_of_tuples):
-    list_of_dict = [dict(zip(keys, values)) for values in list_of_tuples]
-    return list_of_dict
diff --git a/initial_setup.py b/initial_setup.py
new file mode 100644
index 0000000..0384a70
--- /dev/null
+++ b/initial_setup.py
@@ -0,0 +1,23 @@
+import sys
+import requests
+
+
+def download(url, filename):
+    with open(filename, 'wb') as f:
+        response = requests.get(url, stream=True)
+        total = response.headers.get('content-length')
+
+        if total is None:
+            f.write(response.content)
+        else:
+            downloaded = 0
+            total = int(total)
+            for data in response.iter_content(chunk_size=max(int(total/1000), 1024*1024)):
+                downloaded += len(data)
+                f.write(data)
+                done = int(50*downloaded/total)
+                sys.stdout.write('\r[{}{}]'.format('█' * done, '.' * (50-done)))
+                sys.stdout.flush()
+    sys.stdout.write('\n')
+
+print('[*] Downloading test file of size 100 MB...')
\ No newline at end of file
diff --git a/decompressor.py b/libs/decompressor.py
index c54dec9..c54dec9 100644
--- a/decompressor.py
+++ b/libs/decompressor.py
diff --git a/zipper.py b/libs/zipper.py
index 7e5b476..7e5b476 100644
--- a/zipper.py
+++ b/libs/zipper.py
diff --git a/time_series_model.py b/model_builder.py
index 769fa11..b12897a 100644
--- a/time_series_model.py
+++ b/model_builder.py
@@ -1,10 +1,7 @@
 import pandas as pd
-from sql_functions import execute_sql_statement
+from functions.sql_functions import execute_sql_statement
 import pmdarima as pm
 import pickle
-import zlib
-from os.path import exists
-from os import remove
 
 sql_stmt = "select date, city_id, cast(avg_temperature as real) as temp from temperature where date is not null and temp is not null"
 
diff --git a/arima_predictor.py b/predictor.py
index 1b38a0f..18a1708 100644
--- a/arima_predictor.py
+++ b/predictor.py
@@ -1,7 +1,7 @@
 import pandas as pd
 import matplotlib.pyplot as plt
 import pickle
-from decompressor import decompress_arima
+from libs.decompressor import decompress_arima
 
 decompress_arima()
 
diff --git a/requirements.txt b/requirements.txt
index dd9f47b..e0a8db6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,4 @@
 flask
 pandas
+pmdarima
+