Fixes Issue#104.

arangopipe/Dockerfile_Torch_FE

@@ -12,7 +12,7 @@ FROM continuumio/miniconda3
 MAINTAINER Joerg Schad <info@arangodb.com>
 ENV GIT_PYTHON_REFRESH=quiet
 RUN apt-get update && apt-get install -y curl
-RUN pip install mlflow hyperopt sklearn2 jsonpickle python-arango jupyter matplotlib PyYAML==5.1.1 arangopipe==0.0.6.1
+RUN pip install mlflow hyperopt sklearn2 jsonpickle python-arango jupyter matplotlib PyYAML==5.1.1 arangopipe==0.0.6.9.3
 RUN mkdir -p /workspace
 RUN conda install pytorch -c pytorch 
 

arangopipe/makefile

@@ -17,7 +17,7 @@ python_arangopipe:$(SRC)
 upload_test_pypi:
 	twine upload --repository-url https://test.pypi.org/legacy/  -u rajiv.sambasivan -p $(TEST_PYPI_PASSWORD) dist/*
 docker_APSI_build:$(DOCKER_SI_FILE)
-	docker build -t $(DOCKER_SI_IMG_NAME) -f $(DOCKER_SI_FILE) .
+	docker build -t  $(DOCKER_SI_IMG_NAME) -f $(DOCKER_SI_FILE) .
 docker_publish_SI_latest:
 	@echo 'starting docker SI build...'
 	docker login --username arangopipe --password $(DOCKER_PASSWORD)

arangopipe/startup_commands.sh

@@ -6,7 +6,7 @@ echo "Waiting for arangod"
 sleep 5
 done
 echo "arangod is up!"
-foxx install /apmdb /aisis-foxx/aisis-foxx.zip -u root -p /aisis-foxx/passwd.txt 
+foxx install /createDB /aisis-foxx/aisis-foxx.zip -u root -p /aisis-foxx/passwd.txt 
 export PYTHONPATH=$PYTHONPATH:/workspace/experiments/examples/test_data_generator
 python -c "from generate_model_data import generate_runs; generate_runs()"
 npm start

arangopipe/tests/container_tests/torch_arangopipe_testcases.py

@@ -16,26 +16,48 @@
 import sys, traceback
 from ch_torch_linear_regression_driver import run_driver
 from arangopipe.arangopipe_storage.managed_service_conn_parameters import ManagedServiceConnParam
+import yaml
+
 
 class TestArangopipe(unittest.TestCase):
-
+
+    def __init__(self, *args, **kwargs):
+        super(TestArangopipe, self).__init__(*args, **kwargs)
+        self.test_cfg = self.get_test_config()
+        self.mscp = ManagedServiceConnParam()
+
+        return
+
     def setUp(self):
         conn_config = ArangoPipeConfig()
-        self.mscp = ManagedServiceConnParam()
-        conn_params = { self.mscp.DB_SERVICE_HOST : "localhost", \
-                self.mscp.DB_ROOT_USER : "root",\
-                self.mscp.DB_ROOT_USER_PASSWORD : "open sesame",\
-                self.mscp.DB_SERVICE_END_POINT : "apmdb",\
-                self.mscp.DB_SERVICE_NAME : "createDB",\
-                self.mscp.DB_SERVICE_PORT : 8529,\
-                self.mscp.DB_CONN_PROTOCOL : 'http'}
+        conn_params = { self.mscp.DB_SERVICE_HOST : self.test_cfg['arangodb'][self.mscp.DB_SERVICE_HOST], \
+                #self.mscp.DB_ROOT_USER : self.test_cfg['arangodb'][self.mscp.DB_ROOT_USER],\
+                #self.mscp.DB_ROOT_USER_PASSWORD : self.test_cfg['arangodb'][self.mscp.DB_ROOT_USER_PASSWORD],\
+                self.mscp.DB_SERVICE_END_POINT : self.test_cfg['arangodb'][self.mscp.DB_SERVICE_END_POINT],\
+                self.mscp.DB_SERVICE_NAME : self.test_cfg['arangodb'][self.mscp.DB_SERVICE_NAME],\
+                self.mscp.DB_SERVICE_PORT : self.test_cfg['arangodb'][self.mscp.DB_SERVICE_PORT],\
+                self.mscp.DB_CONN_PROTOCOL : self.test_cfg['arangodb'][self.mscp.DB_CONN_PROTOCOL]}
 
 
         conn_config = conn_config.create_connection_config(conn_params)
         self.admin = ArangoPipeAdmin(reuse_connection = False, config = conn_config)
         the_config = self.admin.get_config()
         self.ap = ArangoPipe(config = the_config)
         self.provision_project()
+
+        return
+
+
+    def get_test_config(self):
+        file_name = os.path.join(os.path.dirname(__file__),
+                                     "../test_config/test_datagen_config.yaml")
+        with open(file_name, "r") as file_descriptor:
+            test_cfg = yaml.load(file_descriptor, Loader=yaml.FullLoader)
+
+        return test_cfg
+
+
+
 
     def provision_project(self):
         err_raised = False
@@ -441,12 +463,7 @@ def test_arangopipe_edge_link_add(self):
         return
 
 
-    def tearDown(self):
-        #pass
-        self.admin.delete_arangomldb()
-        self.ap = None
-        self.admin = None
-        return
+
 
 if __name__ == '__main__':
     unittest.main()

arangopipe/tests/pytorch/ch_torch_linear_regression_driver.py

@@ -20,8 +20,17 @@
 import uuid
 import datetime
 from arangopipe.arangopipe_storage.managed_service_conn_parameters import ManagedServiceConnParam
+import yaml
+import os
 #from torch.utils.data.sampler import SubsetRandomSampler
 
+def get_test_config():
+    file_name = os.path.join(os.path.dirname(__file__),
+                                 "../test_config/test_datagen_config.yaml")
+    with open(file_name, "r") as file_descriptor:
+        test_cfg = yaml.load(file_descriptor, Loader=yaml.FullLoader)
+
+    return test_cfg
 
 def run_driver():
 
@@ -99,12 +108,18 @@ def run_driver():
     # Store experiment results in Arangopipe
     conn_config = ArangoPipeConfig()
     msc = ManagedServiceConnParam()
-    conn_params = { msc.DB_SERVICE_HOST : "localhost", \
-                        msc.DB_SERVICE_END_POINT : "apmdb",\
-                        msc.DB_SERVICE_NAME : "createDB",\
-                        msc.DB_SERVICE_PORT : 8529,\
-                        msc.DB_CONN_PROTOCOL : 'http',\
-                        msc.DB_NOTIFICATION_EMAIL : 'somebody@some_company.com'}
+    test_cfg = get_test_config()
+    conn_params = { msc.DB_SERVICE_HOST : test_cfg['arangodb'][msc.DB_SERVICE_HOST], \
+msc.DB_SERVICE_END_POINT : test_cfg['arangodb'][msc.DB_SERVICE_END_POINT],\
+msc.DB_SERVICE_NAME : test_cfg['arangodb'][msc.DB_SERVICE_NAME],\
+msc.DB_SERVICE_PORT : test_cfg['arangodb'][msc.DB_SERVICE_PORT],\
+msc.DB_CONN_PROTOCOL : test_cfg['arangodb'][msc.DB_CONN_PROTOCOL]}
+#    conn_params = { msc.DB_SERVICE_HOST : "localhost", \
+#                        msc.DB_SERVICE_END_POINT : "apmdb",\
+#                        msc.DB_SERVICE_NAME : "createDB",\
+#                        msc.DB_SERVICE_PORT : 8529,\
+#                        msc.DB_CONN_PROTOCOL : 'http',\
+#                        msc.DB_NOTIFICATION_EMAIL : 'somebody@some_company.com'}
 
     conn_config = conn_config.create_connection_config(conn_params)
     proj_info = {"name": "Housing_Price_Estimation_Project"}

arangopipe/tests/test_data_generator/generate_model_data.py

@@ -204,7 +204,7 @@ def generate_runs(clean=False):
         admin.delete_arangomldb()
         admin.create_db()
         admin.create_enterprise_ml_graph()
-
+        
     proj_info = {"name": "Home_Value_Assessor"}
     proj_reg = admin.register_project(proj_info)
 
@@ -244,13 +244,14 @@ def generate_runs(clean=False):
         ds_info["tag"] = dataset_tag
         ds_info["source"] = "Housing Price Operational Data Store"
         featureset["generated_by"] = feature_pipeline_tag
-        featureset["name"] = "log_transformed_house_value"
+        featureset["name"] = "log_transformed_house_value_" + str(ruuid)
         featureset["tag"] = dataset_tag
 
         ds_reg = ap.register_dataset(ds_info)
         fs_reg = ap.register_featureset(featureset, ds_reg["_key"])
         model_tag = "model_period:" + aperiod
-        model_info = {"name": "Housing Regression Model",\
+        model_name = "Housing Regression Model_" + str(ruuid)
+        model_info = {"name": model_name,\
                       "type": "LASSO regression", "tag": model_tag}
         model_reg = ap.register_model(model_info,
                                       project="Home_Value_Assessor")