From 14ad2c04927d66e0faf88ab4d28be3d4c85eb7ea Mon Sep 17 00:00:00 2001 From: Francois Date: Tue, 5 Mar 2019 00:47:57 +0100 Subject: [PATCH] module iss --- {src => iss}/__init__.py | 0 {src => iss}/data/.gitkeep | 0 iss/data/DataBaseManager.py | 48 +++++++++++++++++++ {src => iss}/data/__init__.py | 0 iss/data/database_init.py | 2 + {src => iss}/data/make_dataset.py | 0 {src => iss}/data/resize_collections.py | 0 {src => iss}/data/sync_collections.py | 0 iss/data/sync_collections.sh | 8 ++++ {src => iss}/features/.gitkeep | 0 {src => iss}/features/__init__.py | 0 {src => iss}/features/build_tfrecords.py | 0 {src => iss}/models/.gitkeep | 0 {src => iss}/models/__init__.py | 0 {src => iss}/models/base_model.py | 0 {src => iss}/models/data_loader.py | 0 {src => iss}/models/predict_model.py | 0 {src => iss}/models/train_model.py | 0 {src => iss}/models/trainer_model.py | 0 {src/visualization => iss/tools}/__init__.py | 0 iss/tools/config.py | 22 +++++++++ src/data/sync_collections => iss/untitled.txt | 0 {src => iss}/visualization/.gitkeep | 0 .../visualization/__init__.py | 0 {src => iss}/visualization/visualize.py | 0 25 files changed, 80 insertions(+) rename {src => iss}/__init__.py (100%) rename {src => iss}/data/.gitkeep (100%) create mode 100644 iss/data/DataBaseManager.py rename {src => iss}/data/__init__.py (100%) create mode 100644 iss/data/database_init.py rename {src => iss}/data/make_dataset.py (100%) rename {src => iss}/data/resize_collections.py (100%) rename {src => iss}/data/sync_collections.py (100%) create mode 100644 iss/data/sync_collections.sh rename {src => iss}/features/.gitkeep (100%) rename {src => iss}/features/__init__.py (100%) rename {src => iss}/features/build_tfrecords.py (100%) rename {src => iss}/models/.gitkeep (100%) rename {src => iss}/models/__init__.py (100%) rename {src => iss}/models/base_model.py (100%) rename {src => iss}/models/data_loader.py (100%) rename {src => iss}/models/predict_model.py (100%) rename {src => iss}/models/train_model.py (100%) rename {src => iss}/models/trainer_model.py (100%) rename {src/visualization => iss/tools}/__init__.py (100%) create mode 100644 iss/tools/config.py rename src/data/sync_collections => iss/untitled.txt (100%) rename {src => iss}/visualization/.gitkeep (100%) rename src/data/sync_collections.chkpt => iss/visualization/__init__.py (100%) rename {src => iss}/visualization/visualize.py (100%) diff --git a/src/__init__.py b/iss/__init__.py similarity index 100% rename from src/__init__.py rename to iss/__init__.py diff --git a/src/data/.gitkeep b/iss/data/.gitkeep similarity index 100% rename from src/data/.gitkeep rename to iss/data/.gitkeep diff --git a/iss/data/DataBaseManager.py b/iss/data/DataBaseManager.py new file mode 100644 index 0000000..f873543 --- /dev/null +++ b/iss/data/DataBaseManager.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + + +class DataBaseManager: + + def __init__(self, connexion, config): + self.conn = connexion + self.config = config + self.cursor = self.conn.cursor() + + + def createPicturesTable(self, force = False): + + if force: + self.cursor.execute("DROP TABLE IF EXISTS `iss`.`pictures`;") + + self.cursor.execute(""" +CREATE TABLE `iss`.`pictures` ( + `pictures_latitude` FLOAT(10, 6) NULL, + `pictures_longitude` FLOAT(10, 6 ) NULL , + `pictures_id` VARCHAR( 15 ) PRIMARY KEY , + `pictures_timestamp` TIMESTAMP NULL , + `pictures_location` TEXT NULL +) ENGINE = MYISAM ; + """) + + + def insertRowPictures(self, array): + + sql_insert_template = "INSERT INTO `iss`.`pictures` (pictures_latitude, pictures_longitude, pictures_id, pictures_timestamp, pictures_location) VALUES (%s, %s, %s, %s, %s);" + + self.cursor.executemany(sql_insert_template, array) + self.conn.commit() + + return self.cursor.rowcount + + def select(self, array): + sql = """ +SELECT tmp.* FROM ( + SELECT + COUNT(*) as nb, + pictures_location as location + + FROM iss.pictures + GROUP BY pictures_location + ) as tmp +ORDER BY nb DESC + """ \ No newline at end of file diff --git a/src/data/__init__.py b/iss/data/__init__.py similarity index 100% rename from src/data/__init__.py rename to iss/data/__init__.py diff --git a/iss/data/database_init.py b/iss/data/database_init.py new file mode 100644 index 0000000..633f866 --- /dev/null +++ b/iss/data/database_init.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- + diff --git a/src/data/make_dataset.py b/iss/data/make_dataset.py similarity index 100% rename from src/data/make_dataset.py rename to iss/data/make_dataset.py diff --git a/src/data/resize_collections.py b/iss/data/resize_collections.py similarity index 100% rename from src/data/resize_collections.py rename to iss/data/resize_collections.py diff --git a/src/data/sync_collections.py b/iss/data/sync_collections.py similarity index 100% rename from src/data/sync_collections.py rename to iss/data/sync_collections.py diff --git a/iss/data/sync_collections.sh b/iss/data/sync_collections.sh new file mode 100644 index 0000000..ae5ad94 --- /dev/null +++ b/iss/data/sync_collections.sh @@ -0,0 +1,8 @@ +#!/bin/sh + + +## synchroniser avec les images déjà collectées + +rsync -rve ssh my-deblan:~/projets/ISS-HDEV-wallpaper/Collections/ ~/Projets/smart-iss-posts/data/raw/collections/ + +scp -v ssh my-deblan:~/projets/ISS-HDEV-wallpaper/history.txt ~/Projets/smart-iss-posts/data/raw/history/ \ No newline at end of file diff --git a/src/features/.gitkeep b/iss/features/.gitkeep similarity index 100% rename from src/features/.gitkeep rename to iss/features/.gitkeep diff --git a/src/features/__init__.py b/iss/features/__init__.py similarity index 100% rename from src/features/__init__.py rename to iss/features/__init__.py diff --git a/src/features/build_tfrecords.py b/iss/features/build_tfrecords.py similarity index 100% rename from src/features/build_tfrecords.py rename to iss/features/build_tfrecords.py diff --git a/src/models/.gitkeep b/iss/models/.gitkeep similarity index 100% rename from src/models/.gitkeep rename to iss/models/.gitkeep diff --git a/src/models/__init__.py b/iss/models/__init__.py similarity index 100% rename from src/models/__init__.py rename to iss/models/__init__.py diff --git a/src/models/base_model.py b/iss/models/base_model.py similarity index 100% rename from src/models/base_model.py rename to iss/models/base_model.py diff --git a/src/models/data_loader.py b/iss/models/data_loader.py similarity index 100% rename from src/models/data_loader.py rename to iss/models/data_loader.py diff --git a/src/models/predict_model.py b/iss/models/predict_model.py similarity index 100% rename from src/models/predict_model.py rename to iss/models/predict_model.py diff --git a/src/models/train_model.py b/iss/models/train_model.py similarity index 100% rename from src/models/train_model.py rename to iss/models/train_model.py diff --git a/src/models/trainer_model.py b/iss/models/trainer_model.py similarity index 100% rename from src/models/trainer_model.py rename to iss/models/trainer_model.py diff --git a/src/visualization/__init__.py b/iss/tools/__init__.py similarity index 100% rename from src/visualization/__init__.py rename to iss/tools/__init__.py diff --git a/iss/tools/config.py b/iss/tools/config.py new file mode 100644 index 0000000..2b05250 --- /dev/null +++ b/iss/tools/config.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- + +import os +import sys +import yaml +from dotenv import find_dotenv, load_dotenv + +load_dotenv(find_dotenv()) + +class Config: + + def __init__(self, project_dir = os.getenv("PROJECT_DIR"), mode = os.getenv("MODE")): + + self.project_dir = project_dir + self.mode = mode + + with open(os.path.join(self.project_dir, 'config', 'config_%s.yaml' % (self.mode)), 'r') as ymlfile: + self.config = yaml.load(ymlfile) + + def get(self, key): + return self.config[key] + diff --git a/src/data/sync_collections b/iss/untitled.txt similarity index 100% rename from src/data/sync_collections rename to iss/untitled.txt diff --git a/src/visualization/.gitkeep b/iss/visualization/.gitkeep similarity index 100% rename from src/visualization/.gitkeep rename to iss/visualization/.gitkeep diff --git a/src/data/sync_collections.chkpt b/iss/visualization/__init__.py similarity index 100% rename from src/data/sync_collections.chkpt rename to iss/visualization/__init__.py diff --git a/src/visualization/visualize.py b/iss/visualization/visualize.py similarity index 100% rename from src/visualization/visualize.py rename to iss/visualization/visualize.py