Skip to content

Commit

Permalink
This closes #14 and closes #16
Browse files Browse the repository at this point in the history
  • Loading branch information
estasney committed Dec 22, 2017
1 parent a91a92f commit 38b2b75
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 44 deletions.
Empty file.
19 changes: 0 additions & 19 deletions home/estasney/mysite/config/web_config.py

This file was deleted.

8 changes: 2 additions & 6 deletions home/estasney/mysite/flask_app.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
from flask import Flask, render_template, request, jsonify
from my_config import Config as config
from modules import text_tools
from modules import diversity_tools
from modules import upload_tools
from modules import neural_tools
from modules import Utils



""" LOAD CONFIG """

try:
from config import local_config as config
except ImportError:
from config import web_config as config


UPLOAD_FOLDER = config.UPLOAD_FOLDER
app = Flask(__name__)
Expand Down
8 changes: 7 additions & 1 deletion home/estasney/mysite/modules/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
from config import local_config
import sys
import os
sys.path.append(os.path.join(os.getcwd(), '/home/estasney/mysite/modules'))
sys.path.append(os.path.join(os.getcwd(), '/home/estasney/mysite/my_config'))

from home.estasney.mysite.modules import diversity_tools, neural_tools, text_tools, upload_tools, Utils

6 changes: 1 addition & 5 deletions home/estasney/mysite/modules/diversity_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
from operator import itemgetter
import numpy as np
import scipy

try:
from config import local_config as config
except ImportError:
from config import web_config as config
from home.estasney.mysite.my_config import Config as config

# Load Tree Classifier

Expand Down
7 changes: 2 additions & 5 deletions home/estasney/mysite/modules/neural_tools.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
from gensim.models import Doc2Vec
import sys
sys.path.append("home/estasney/mysite/config")
sys.path.append("home/estasney/mysite/my_config")


try:
from home.estasney.mysite.config import local_config as config
except ImportError:
from config import web_config as config
from home.estasney.mysite.my_config import Config as config

def prettify_dict(d):
p_dict = {}
Expand Down
5 changes: 1 addition & 4 deletions home/estasney/mysite/modules/text_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
from nltk.stem.porter import PorterStemmer
from nltk.tokenize.moses import MosesTokenizer

try:
from config import local_config as config
except ImportError:
from config import web_config as config
from home.estasney.mysite.my_config import Config as config

# Raw
tfidf_model = TfidfModel.load(config.tfidf_model)
Expand Down
5 changes: 1 addition & 4 deletions home/estasney/mysite/modules/upload_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
from werkzeug.utils import secure_filename
from flask import Flask

try:
from config import local_config as config
except ImportError:
from config import web_config as config
from home.estasney.mysite.my_config import Config as config

"""
Expand Down
10 changes: 10 additions & 0 deletions home/estasney/mysite/my_config/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import sys
import os
sys.path.append(os.path.join(os.getcwd(), '/home/estasney/mysite/my_config'))
try:
from home.estasney.mysite.my_config import local_config
Config = local_config.Config()
except ImportError:
from home.estasney.mysite.my_config import web_config
Config = web_config.Config()

27 changes: 27 additions & 0 deletions home/estasney/mysite/my_config/web_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import os
import sys
# Add the modules path to sys.path

cwd = os.getcwd()
modules_rel = '/home/estasney/mysite/modules'

sys.path.append(os.path.join(cwd, modules_rel))

class Config(object):
model = '/home/estasney/mysite/resources/mymodel.model'
gram_path = '/home/estasney/mysite/resources/trigram_model.p'
tree = "/home/estasney/mysite/resources/tree_classifier.pickle"
name_dict = '/home/estasney/mysite/resources/name_dict.pickle'
global_name_dict = '/home/estasney/mysite/resources/global_name_dict.pickle'
name_file_path = '/home/estasney/mysite/resources/name_list.csv'
raw_dict = '/home/estasney/mysite/resources/tfidf_dict.dict'
tfidf_model = '/home/estasney/mysite/resources/tfidf.model'
bigram_dict_path = '/home/estasney/mysite/resources/bigram_tfidf_dict.dict'
bigram_tfidf_model_path = '/home/estasney/mysite/resources/bigram_tfidf.model'
lem_dict_path = '/home/estasney/mysite/resources/l_dictionary.dict'
lem_tfidf_model_path = '/home/estasney/mysite/resources/l_tfidf.model'
lg_dict_path = '/home/estasney/mysite/resources/lg_dictionary.dict'
lg_tfidf_model_path = '/home/estasney/mysite/resources/lg_tfidf.model'
UPLOAD_FOLDER = '/home/estasney/mysite/uploads'
dupcheck_version = '0.1.1'

0 comments on commit 38b2b75

Please sign in to comment.