summaryrefslogtreecommitdiff
path: root/megapixels/app/settings/app_cfg.py
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-12-16 01:14:40 +0100
committerJules Laplace <julescarbon@gmail.com>2018-12-16 01:14:40 +0100
commitf9616b08ce0fa8ab5d60b544b5c0ad1212f201b8 (patch)
treedf2036f710122c9f4979785c643b76622b7c5989 /megapixels/app/settings/app_cfg.py
parent63335120a5800142ebe827bd10a1a0106c24b8d8 (diff)
parent10f467b64e3be528ac246d5cf664d675aca3e7f3 (diff)
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'megapixels/app/settings/app_cfg.py')
-rw-r--r--megapixels/app/settings/app_cfg.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index d25936e6..50eaf576 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -4,15 +4,9 @@ import logging
import collections
from dotenv import load_dotenv
-import cv2 as cv
-
from app.settings import types
from app.utils import click_utils
-# -----------------------------------------------------------------------------
-# Metadata type names
-# -----------------------------------------------------------------------------
-
# -----------------------------------------------------------------------------
# Enun lists used for custom Click Params
@@ -23,6 +17,7 @@ HaarCascadeVar = click_utils.ParamVar(types.HaarCascade)
LogLevelVar = click_utils.ParamVar(types.LogLevel)
MetadataVar = click_utils.ParamVar(types.Metadata)
DatasetVar = click_utils.ParamVar(types.Dataset)
+DataStoreVar = click_utils.ParamVar(types.DataStore)
# # data_store
DATA_STORE = '/data_store_hdd/'
@@ -34,6 +29,7 @@ DIR_DATSET_NAS = join(DIR_DATASETS, 'people')
DIR_APPS = join(DATA_STORE,'apps')
DIR_APP = join(DIR_APPS,'megapixels')
DIR_MODELS = join(DIR_APP,'models')
+DIR_PEOPLE = 'people'
# # Frameworks
DIR_MODELS_CAFFE = join(DIR_MODELS,'caffe')
@@ -121,8 +117,12 @@ LOGFILE_FORMAT = "%(log_color)s%(levelname)-8s%(reset)s %(cyan)s%(filename)s:%(l
# -----------------------------------------------------------------------------
# S3 storage
# -----------------------------------------------------------------------------
-S3_MEDIA_ROOT = 's3://megapixels/v1/media/'
-S3_METADATA_ROOT = 's3://megapixels/v1/metadata/'
+S3_ROOT_URL = 's3://megapixels/v1/'
+S3_MEDIA_URL = join(S3_ROOT_URL, 'media')
+S3_METADATA_URL = join(S3_ROOT_URL, 'metadata')
+S3_HTTP_URL = 'https://megapixels.nyc3.digitaloceanspaces.com/v1/'
+S3_HTTP_MEDIA_URL = join(S3_HTTP_URL, 'media')
+S3_HTTP_METADATA_URL = join(S3_HTTP_URL, 'metadata')
# -----------------------------------------------------------------------------
# Static site generator