pyxetabase 3.1.0.dev9__py3-none-any.whl → 3.1.0.dev11__py3-none-any.whl

pyopencga/opencga_config.py

@@ -37,12 +37,21 @@ class ClientConfiguration(object):
         return config_dict
 
     def get_sso_login_info(self):
+        # Checking if SSO login is specified
         if (('sso_login' in self._config and self._config['sso_login']) or
                 ('cookies' in self._config and self._config['cookies'])):
-            python_session_fhand = open(os.path.expanduser("~/.opencga/session.json"), 'r')
+
+            # Getting session file name
+            if 'name' in self._config['rest'] and self._config['rest']['name']:
+                host_name = self._config['rest']['name']
+            else:
+                host_name = 'opencga'
+            python_session_fhand = open(os.path.expanduser("~/.opencga/{}_session.json".format(host_name)), 'r')
+
+            # Loading info from session file
             session_info = json.loads(python_session_fhand.read())
             self._config['sso_login'] = True
-            self._config['cookies'] = session_info['cookies']
+            self._config['cookies'] = session_info['attributes']['cookies']
             self._config['token'] = session_info['token']
 
     def _validate_configuration(self):

pyopencga/rest_clients/file_client.py

@@ -420,7 +420,7 @@ class File(_ParentRestClient):
             MICROARRAY_EXPRESSION_TWOCHANNELS_GENEPIX DATAMATRIX_EXPRESSION
             IDLIST IDLIST_RANKED ANNOTATION_GENEVSANNOTATION OTHER_NEWICK
             OTHER_BLAST OTHER_INTERACTION OTHER_GENOTYPE OTHER_PLINK OTHER_VCF
-            OTHER_PED VCF4 VARIANT ALIGNMENT COVERAGE SEQUENCE PEDIGREE
+            OTHER_PED VCF4 CVDB VARIANT ALIGNMENT COVERAGE SEQUENCE PEDIGREE
             REFERENCE_GENOME NONE UNKNOWN']
         :param str checksum: Expected MD5 file checksum.
         :param bool resource: Boolean field indicating whether the file is a

pyxetabase/opencga_config.py

@@ -37,12 +37,21 @@ class ClientConfiguration(object):
         return config_dict
 
     def get_sso_login_info(self):
+        # Checking if SSO login is specified
         if (('sso_login' in self._config and self._config['sso_login']) or
                 ('cookies' in self._config and self._config['cookies'])):
-            python_session_fhand = open(os.path.expanduser("~/.opencga/session.json"), 'r')
+
+            # Getting session file name
+            if 'name' in self._config['rest'] and self._config['rest']['name']:
+                host_name = self._config['rest']['name']
+            else:
+                host_name = 'opencga'
+            python_session_fhand = open(os.path.expanduser("~/.opencga/{}_session.json".format(host_name)), 'r')
+
+            # Loading info from session file
             session_info = json.loads(python_session_fhand.read())
             self._config['sso_login'] = True
-            self._config['cookies'] = session_info['cookies']
+            self._config['cookies'] = session_info['attributes']['cookies']
             self._config['token'] = session_info['token']
 
     def _validate_configuration(self):

pyxetabase/rest_clients/file_client.py

@@ -420,7 +420,7 @@ class File(_ParentRestClient):
             MICROARRAY_EXPRESSION_TWOCHANNELS_GENEPIX DATAMATRIX_EXPRESSION
             IDLIST IDLIST_RANKED ANNOTATION_GENEVSANNOTATION OTHER_NEWICK
             OTHER_BLAST OTHER_INTERACTION OTHER_GENOTYPE OTHER_PLINK OTHER_VCF
-            OTHER_PED VCF4 VARIANT ALIGNMENT COVERAGE SEQUENCE PEDIGREE
+            OTHER_PED VCF4 CVDB VARIANT ALIGNMENT COVERAGE SEQUENCE PEDIGREE
             REFERENCE_GENOME NONE UNKNOWN']
         :param str checksum: Expected MD5 file checksum.
         :param bool resource: Boolean field indicating whether the file is a

{pyxetabase-3.1.0.dev9.dist-info → pyxetabase-3.1.0.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyxetabase
-Version: 3.1.0.dev9
+Version: 3.1.0.dev11
 Summary: A REST client for OpenCGA enterprise REST web services
 Author: Daniel Perez-Gil
 Author-email: daniel.perez@zettagenomics.com

{pyxetabase-3.1.0.dev9.dist-info → pyxetabase-3.1.0.dev11.dist-info}/RECORD

@@ -2,7 +2,7 @@ pyopencga/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyopencga/commons.py,sha256=asnM3N7Q6JdgD6hXWmlX875HJizTLAODqs0dl3UYH-E,14307
 pyopencga/exceptions.py,sha256=GmtDcurD3d_fzaa8AEntF4-sZR4Elgg4Iz3z-UUqjYU,274
 pyopencga/opencga_client.py,sha256=gM9UzbjXwHKYRbsz3qmhS8xHuIlr13sn-VEzx6cscxk,14858
-pyopencga/opencga_config.py,sha256=TCzg_9k7tl1M2OqKIrpP8jEdKodzrTh1iN-rgSWEl1M,5687
+pyopencga/opencga_config.py,sha256=hqBChooRKrkA6JmEbb6pOBTlfE_tv6_67H5WTKUXoDE,6047
 pyopencga/rest_response.py,sha256=Gx7utYTsXV-aciFZV4f7M2eNDQg5IlphGK_T8q_PhHE,8634
 pyopencga/retry.py,sha256=_X02bDcJmr9cWH4Bt0YfUPkYborpuStmw5WDDKczwHM,2296
 pyopencga/rest_clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,7 +13,7 @@ pyopencga/rest_clients/clinical_analysis_client.py,sha256=e14y-qJznmAIMsIVpdh2yn
 pyopencga/rest_clients/cohort_client.py,sha256=6HcNiUL3WVsLfRtcitwJuxyraECJ6RExV8GvE2oQhDM,16323
 pyopencga/rest_clients/disease_panel_client.py,sha256=dD5_nzetek5Hk2sSqT1JasdNu8ohkO3yMfdY76jGU8U,18512
 pyopencga/rest_clients/family_client.py,sha256=MC8WHfzycB7WeRqb8FZEt2YLFTNrdSnky-bHwsr-6uY,18585
-pyopencga/rest_clients/file_client.py,sha256=xoUE7e1oyaVhdO-ZnLEnbyUPTgyKGYhhtqXwvhkPP90,33724
+pyopencga/rest_clients/file_client.py,sha256=SnFrV6Bs-_ZMoZMoGviNMK1yi2xLXnTQCjm20ovecew,33729
 pyopencga/rest_clients/ga4gh_client.py,sha256=iU0PvOmxTbhFS-AUD6BDp41uU1BAxWJUiiv1waioX6A,3505
 pyopencga/rest_clients/individual_client.py,sha256=jYO4nHluP-gsdX7iM43qwlP9t9QIZBPiUv8sNXMOQ1Q,23224
 pyopencga/rest_clients/job_client.py,sha256=2u1fBSFb87gRsxcsF6ySQGgnKSJLCiaczrxUQ_iAesQ,19810
@@ -30,7 +30,7 @@ pyxetabase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxetabase/commons.py,sha256=Okt5DgvSpZW9PUsxoLNpROb0BDrdr_zhgry4X3dQpfk,14308
 pyxetabase/exceptions.py,sha256=GmtDcurD3d_fzaa8AEntF4-sZR4Elgg4Iz3z-UUqjYU,274
 pyxetabase/opencga_client.py,sha256=V-M9i28z3A-Vgw5BnG_Ddm0MUdjQ0_XG38gohGtzavI,15386
-pyxetabase/opencga_config.py,sha256=TCzg_9k7tl1M2OqKIrpP8jEdKodzrTh1iN-rgSWEl1M,5687
+pyxetabase/opencga_config.py,sha256=hqBChooRKrkA6JmEbb6pOBTlfE_tv6_67H5WTKUXoDE,6047
 pyxetabase/rest_response.py,sha256=TgwTI2LZFF_jV9-HSawGkF_qZ88n-dxEtIKiFcfPyDk,8635
 pyxetabase/retry.py,sha256=LjViQOaa_GkpDFkcRq9jIS183mE9t4Rq0uls9PV_mfI,2297
 pyxetabase/rest_clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,7 +43,7 @@ pyxetabase/rest_clients/cvdb_client.py,sha256=V7ny5nQEeJqsbALAe7JLyoV6b0XyYF7c9l
 pyxetabase/rest_clients/disease_panel_client.py,sha256=GAYRyAfoB_VunskXOhAzMNbsrFupb6M2QbRK3x1Y5vo,18513
 pyxetabase/rest_clients/family_client.py,sha256=n-kyjnrV09R50JxyiHjFs8rCQkOKFU0Z1O7oVYuaKxg,18586
 pyxetabase/rest_clients/federation_client.py,sha256=p5B8dRq9gj-fdgIfIPhmkT7mNU65cRFtH06kaGtmbWE,5066
-pyxetabase/rest_clients/file_client.py,sha256=7mGziH-_IuHuhs7B2yOby3s969qHqDMNLAOpDdnE3J0,33725
+pyxetabase/rest_clients/file_client.py,sha256=fwTWnZtprYNDUBvRetLLe6PTBxW_M8LxN6OlAMGWXC4,33730
 pyxetabase/rest_clients/ga4gh_client.py,sha256=fPnmiblnfpz_zcZPJblGqOFksrdiF3MUer3fv2nwQwk,3506
 pyxetabase/rest_clients/individual_client.py,sha256=C59zr_t7tTxNR7ZBeAPY6fyYl59fE7KY05MaLyXWmXw,23225
 pyxetabase/rest_clients/job_client.py,sha256=amoBW3SL56l6sAPCUB55rZhLR8DcdIIfb5ymOZ9NkLQ,19811
@@ -56,8 +56,8 @@ pyxetabase/rest_clients/user_client.py,sha256=frA7-rMii-yoRyca_Orkj1T80OeEe-zCdW
 pyxetabase/rest_clients/variant_client.py,sha256=mmBuVE0JBThJr5zsLGci5nykNcCKyfZXRKl-h3HT9PA,75436
 pyxetabase/rest_clients/variant_operation_client.py,sha256=oN7AEQzAkrmLQLbw86CODCEnR5xM6UkqrdN-9WPO_rM,36911
 pyxetabase/rest_clients/workflow_client.py,sha256=QYnyI17aNCjq-uXlguaSj78F0xupeWwmf8uYK1Y5tf4,12482
-pyxetabase-3.1.0.dev9.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyxetabase-3.1.0.dev9.dist-info/METADATA,sha256=cWh7nPApZLprweUs6Rq8iMFcuBHpVuufCSdjsehoiWQ,5539
-pyxetabase-3.1.0.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyxetabase-3.1.0.dev9.dist-info/top_level.txt,sha256=0m5pDpBX-lM8QpPl7bTpTQAm4kgu2-nr-pcaEu4Tn_8,11
-pyxetabase-3.1.0.dev9.dist-info/RECORD,,
+pyxetabase-3.1.0.dev11.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyxetabase-3.1.0.dev11.dist-info/METADATA,sha256=5eNn_cxoOQBduwDYb-l5zuOuB2cmEVOLtg4piND9lzA,5540
+pyxetabase-3.1.0.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyxetabase-3.1.0.dev11.dist-info/top_level.txt,sha256=0m5pDpBX-lM8QpPl7bTpTQAm4kgu2-nr-pcaEu4Tn_8,11
+pyxetabase-3.1.0.dev11.dist-info/RECORD,,