diff --git a/home/estasney/mysite/modules/__init__.py b/home/estasney/mysite/modules/__init__.py index 65b03c7..f374590 100644 --- a/home/estasney/mysite/modules/__init__.py +++ b/home/estasney/mysite/modules/__init__.py @@ -3,5 +3,12 @@ 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 +sys.path.append('/home/estasney/mysite/my_config') +sys.path.append('/home/estasney/mysite/modules') + +try: + from home.estasney.mysite.modules import diversity_tools, neural_tools, text_tools, upload_tools, Utils +except ImportError: + import diversity_tools, neural_tools, text_tools, upload_tools, Utils + diff --git a/home/estasney/mysite/modules/diversity_tools.py b/home/estasney/mysite/modules/diversity_tools.py index cd35e3b..7b13cee 100644 --- a/home/estasney/mysite/modules/diversity_tools.py +++ b/home/estasney/mysite/modules/diversity_tools.py @@ -3,7 +3,13 @@ from operator import itemgetter import numpy as np import scipy -from home.estasney.mysite.my_config import Config as config +import sys +sys.path.append('/home/estasney/mysite/my_config') +try: + from home.estasney.mysite.my_config import Config as config +except ImportError: + import web_config + config = web_config.Config() # Load Tree Classifier diff --git a/home/estasney/mysite/modules/neural_tools.py b/home/estasney/mysite/modules/neural_tools.py index 40da7a0..aab7bb1 100644 --- a/home/estasney/mysite/modules/neural_tools.py +++ b/home/estasney/mysite/modules/neural_tools.py @@ -1,10 +1,13 @@ from gensim.models import Doc2Vec import sys -sys.path.append("home/estasney/mysite/my_config") +sys.path.append('/home/estasney/mysite/my_config') +try: + from home.estasney.mysite.my_config import Config as config +except ImportError: + import web_config + config = web_config.Config() -from home.estasney.mysite.my_config import Config as config - def prettify_dict(d): p_dict = {} for k, v in d.items(): diff --git a/home/estasney/mysite/modules/text_tools.py b/home/estasney/mysite/modules/text_tools.py index 0f7f84e..eccbb61 100644 --- a/home/estasney/mysite/modules/text_tools.py +++ b/home/estasney/mysite/modules/text_tools.py @@ -1,6 +1,6 @@ import re import string - +import sys import gensim import nltk import pandas as pd @@ -9,8 +9,12 @@ from gensim.summarization import keywords as KW from nltk.stem.porter import PorterStemmer from nltk.tokenize.moses import MosesTokenizer - -from home.estasney.mysite.my_config import Config as config +sys.path.append('/home/estasney/mysite/my_config') +try: + from home.estasney.mysite.my_config import Config as config +except ImportError: + import web_config + config = web_config.Config() # Raw tfidf_model = TfidfModel.load(config.tfidf_model) diff --git a/home/estasney/mysite/modules/upload_tools.py b/home/estasney/mysite/modules/upload_tools.py index 3ec74c0..3b9dbc8 100644 --- a/home/estasney/mysite/modules/upload_tools.py +++ b/home/estasney/mysite/modules/upload_tools.py @@ -2,10 +2,15 @@ import pandas as pd from werkzeug.utils import secure_filename from flask import Flask +import sys +sys.path.append('/home/estasney/mysite/my_config') +try: + from home.estasney.mysite.my_config import Config as config +except ImportError: + import web_config + config = web_config.Config() -from home.estasney.mysite.my_config import Config as config - -""" +""" GLOBAL PARAMETERS diff --git a/home/estasney/mysite/my_config/__init__.py b/home/estasney/mysite/my_config/__init__.py index a8b90a6..0523c5c 100644 --- a/home/estasney/mysite/my_config/__init__.py +++ b/home/estasney/mysite/my_config/__init__.py @@ -1,10 +1,11 @@ import sys import os sys.path.append(os.path.join(os.getcwd(), '/home/estasney/mysite/my_config')) +sys.path.append('/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 + import web_config Config = web_config.Config() diff --git a/home/estasney/mysite/my_config/web_config.py b/home/estasney/mysite/my_config/web_config.py index 35e8b95..780f7ad 100644 --- a/home/estasney/mysite/my_config/web_config.py +++ b/home/estasney/mysite/my_config/web_config.py @@ -24,4 +24,3 @@ class Config(object): lg_tfidf_model_path = '/home/estasney/mysite/resources/lg_tfidf.model' UPLOAD_FOLDER = '/home/estasney/mysite/uploads' dupcheck_version = '0.1.1' -