Merge pull request #2 from dsavchenko/master

minimal working version

MANIFEST.in

@@ -1,2 +1 @@
-cdci_antares_plugin/pkg_info.json
-
+dispatcher_plugin_integral/pkg_info.json

cdci_antares_plugin/antares.py → dispatcher_plugin_antares/antares.py

@@ -16,7 +16,7 @@
 # relative import eg: from .mod import f
 
 
-from cdci_antares_plugin import conf_file, conf_dir
+from dispatcher_plugin_antares import conf_file, conf_dir
 
 from cdci_data_analysis.analysis.queries import *
 from cdci_data_analysis.analysis.instrument import Instrument
@@ -37,8 +37,8 @@ def common_instr_query():
     #spec_window = ParameterRange(E1_keV, E2_keV, 'spec_window')
     #instr_query_pars = [spec_window]
 
-    radius = Angle(value=5.0, units='deg', name='radius')
-    use_internal_resolver= Parameter(value='False',name='use_internal_resolver',allowed_values=['False','True'])
+    radius = Angle(value=2.5, units='deg', name='radius')
+    use_internal_resolver = Parameter(value='False',name='use_internal_resolver',allowed_values=['False','True'])
     instr_query_pars = [radius,use_internal_resolver]
 
     return instr_query_pars
@@ -59,7 +59,7 @@ def antares_factory():
     instr_query_pars.append(index_min)
     instr_query_pars.append(index_max)
 
-    instr_query = InstrumentQuery(name=' ',
+    instr_query = InstrumentQuery(name='instr_query',
                                   extra_parameters_list=instr_query_pars,
                                   input_prod_list_name=None,
                                   input_prod_value=None,

cdci_antares_plugin/antares_dataserver_dispatcher.py → dispatcher_plugin_antares/antares_dataserver_dispatcher.py

@@ -19,14 +19,14 @@
 # relative import eg: from .mod import f
 import  logging
 import  simple_logger
-from cdci_antares_plugin import conf_file as plugin_conf_file
+from dispatcher_plugin_antares import conf_file as plugin_conf_file
 from cdci_data_analysis.configurer import DataServerConf
 from cdci_data_analysis.analysis.queries import  *
 from cdci_data_analysis.analysis.job_manager import  Job
 from cdci_data_analysis.analysis.io_helper import FilePath
 from cdci_data_analysis.analysis.products import  QueryOutput
 
-from antares_data_server.backend_api import APIError
+from cdci_data_analysis.analysis.exceptions import APIerror
 
 import json
 import traceback
@@ -75,6 +75,7 @@ def __init__(self, message='ANTARES analysis exception', debug_message=''):
 
 class ANTARESException(Exception):
 
+
     def __init__(self, message='ANTARES  exception', debug_message=''):
         super(ANTARESException, self).__init__(message)
         self.message=message
@@ -103,24 +104,24 @@ def __init__(self,config=None,task=None,param_dict=None,instrument=None):
         for k in instrument.data_server_conf_dict.keys():
            print ('dict:',k,instrument.data_server_conf_dict[k ])
 
-        config = DataServerConf(data_server_url=instrument.data_server_conf_dict['data_server_url'])
+        config = DataServerConf.from_conf_dict(instrument.data_server_conf_dict)
+
         #for v in vars(config):
         #   print('attr:', v, getattr(config, v))
 
 
         print('--> config passed to init',config)
 
         if config is not None:
-
+            
             pass
 
 
-
         elif instrument is not None and hasattr(instrument,'data_server_conf_dict'):
 
             print('--> from data_server_conf_dict')
             try:
-                config = DataServerConf(data_server_url=instrument.data_server_conf_dict['data_server_url'])
+                config = DataServerConf.from_conf_dict(instrument.data_server_conf_dict)
 
                 print('config', config)
                 for v in vars(config):
@@ -188,9 +189,6 @@ def test_communication(self, max_trial=10, sleep_s=1,logger=None):
         url = "%s/%s" % (self.data_server_url, 'api/v1.0/antares/test-connection')
         print('url', url)
 
-
-
-
         for i in range(max_trial):
             try:
                 res = requests.get("%s" % (url), params=None)
@@ -199,10 +197,10 @@ def test_communication(self, max_trial=10, sleep_s=1,logger=None):
                     no_connection =True
                 else:
                     no_connection=False
+
                     message = 'Connection OK'
                     query_out.set_done(message=message, debug_message=str(debug_message))
                     break
-
             except Exception as e:
                 no_connection = True
 
@@ -216,7 +214,7 @@ def test_communication(self, max_trial=10, sleep_s=1,logger=None):
             query_out.set_failed(message,
                                  message='connection_status=%s' % connection_status_message,
                                  logger=logger,
-                                 excep=e,
+                                 excep=e, # may be referenced before assignment
                                  e_message=message,
                                  debug_message=debug_message)
 
@@ -293,8 +291,8 @@ def run_query(self,call_back_url=None,run_asynch=False,logger=None,task=None,par
 
 
 
-
-        except APIError as e:
+        # TODO: how can it be thrown?
+        except APIerror as e:
             run_query_message = 'API Exception on ANTARES backend'
             debug_message = e.message
 

cdci_antares_plugin/antares_table_query.py → dispatcher_plugin_antares/antares_table_query.py

@@ -85,7 +85,6 @@ def get_html_draw(self):
     @classmethod
     def build_from_res(cls,res,out_dir=None,prod_prefix='antares_table'):
 
-
         prod_list = []
 
         if out_dir is None:
@@ -169,6 +168,7 @@ def get_data_server_query(self, instrument,config=None):
         RA = instrument.get_par_by_name('RA').value
         DEC = instrument.get_par_by_name('DEC').value
         ROI = instrument.get_par_by_name('radius').value
+
         index_min=instrument.get_par_by_name('index_min').value
         index_max=instrument.get_par_by_name('index_max').value
         #TODO move this to be self-consistent with Antares backend conf
@@ -188,7 +188,6 @@ def get_data_server_query(self, instrument,config=None):
 
         return q
 
-
     def set_instr_dictionaries(self,ra=None,
                                    dec=None,
                                    roi=None,

setup.py

@@ -31,14 +31,14 @@
 include_package_data=True
 
 scripts_list=glob.glob('./bin/*')
-setup(name='cdci_antares_plugin',
+setup(name='dispatcher_plugin_antares',
       version=1.0,
       description='ANTARES plugin  for CDCI online data analysis',
       author='Andrea Tramacere',
       author_email='andrea.tramacere@unige.ch',
       scripts=scripts_list,
       packages=packs,
-      package_data={'cdci_antares_plugin':['config_dir/*']},
+      package_data={'dispatcher_plugin_antares':['config_dir/*']},
       include_package_data=True,
       install_requires=install_req,
 )