libhdbpp-python 0.0.22__tar.gz → 0.0.31__tar.gz

{libhdbpp-python-0.0.22 → libhdbpp-python-0.0.31}/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: libhdbpp-python
-Version: 0.0.22
-Summary: Python bindings for Tango Control System Archiving
+Version: 0.0.31
+Summary: Moved to https://pypi.org/project/pyhdbpp (Python bindings for Tango Control System Archiving)
 Home-page: https://gitlab.com/tango-controls/hdbpp/libhdbpp-python
 Author: Sergi Rubio
 Author-email: srubio@cells.es
 License: LGPL-3+
-Description: hdbbpp readers for mariadb and timescaledb
-        Extract data from HDB++ Tango Archiving Systems, using either MariaDB or TimeScaleDB
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Provides-Extra: timescaledb
+License-File: LICENSE
+
+hdbbpp readers for mariadb and timescaledb
+Extract data from HDB++ Tango Archiving Systems, using either MariaDB or TimeScaleDB

libhdbpp-python-0.0.31/README

@@ -0,0 +1,15 @@
+RENAMED to pyhdbpp!
+
+new pypi project at https://pypi.org/project/pyhdbpp
+
+Development continues at https://gitlab.com/tango-controls/hdbpp/libhdbpp-python
+
+# Python Hdb++ Reader
+
+Python module for extraction from multiple hdb++ engines.
+
+Renamed to pyhdbpp, see previous links.
+
+For legacy archiving and full hdb++ api (MySQL only) use PyTangoArchiving instead
+
+

{libhdbpp-python-0.0.22/pyhdbpp → libhdbpp-python-0.0.31/hdbpp}/__init__.py

@@ -1,6 +1,6 @@
 
-RELEASE = (0,0,22)
+RELEASE = (0,0,31)
 
 version_major, version_minor, version_patch = RELEASE
 
-from pyhdbpp.reader import *
+from .reader import *

{libhdbpp-python-0.0.22/pyhdbpp → libhdbpp-python-0.0.31/hdbpp}/mariadb/mariadb.py

@@ -249,7 +249,8 @@ class MariaDBReader(AbstractReader):
             (epoch1, r_value, w_value, quality, error_desc),
             ... ]
         """
-        r = self.get_attributes_values([attribute], start_date, stop_date, decimate, False, **params)
+        r = self.get_attributes_values([attribute], start_date, stop_date, 
+                                       decimate, False, **params)
         #print(r.keys(),start_date,stop_date)
         return r[attribute]
 
@@ -309,19 +310,19 @@ class MariaDBReader(AbstractReader):
                 #print(cols)
                 if 'data_time,' in cols:
                     cols = cols.replace('data_time,',
-                                 'CAST(UNIX_TIMESTAMP(data_time) AS DOUBLE),')
+                        'CAST(UNIX_TIMESTAMP(data_time) AS DOUBLE),')
                 q = ('select %s from %s where '
                     'att_conf_id = %s and %s between %s and %s '
                     'order by data_time'
                     % (cols, t, i, tcol, b, e))
-                print(q)
+                
+                #print(q)
                 data[a] = self._query(q, prune=decimate)
-                print(len(data[a]),'L')
+                print('obtained data: {}'.format(len(data[a]),'L'))
             except:
                 import traceback
                 traceback.print_exc()
                 data[a] = []
-                #raise Exception('AttributeNotFound: %s' % a) 
 
         return data        
         

{libhdbpp-python-0.0.22/pyhdbpp → libhdbpp-python-0.0.31/hdbpp}/qt/plot.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
-import pyhdbpp
+import hdbpp
 import pyqtgraph
 import threading
 
@@ -9,7 +9,7 @@ import threading
 
 def plot_attributes_values(attributes,begin,end,schema='',show=False):
 
-    rd = pyhdbpp.get_default_reader() if not schema else pyhdbpp.reader(config=schema)
+    rd = hdbpp.get_default_reader() if not schema else hdbpp.reader(config=schema)
     _cursor = rd._cursor
 
     plot = pyqtgraph.plot()

{libhdbpp-python-0.0.22/pyhdbpp → libhdbpp-python-0.0.31/hdbpp}/reader.py

@@ -50,20 +50,26 @@ def get_default_reader(tango_host=''):
 
         get_hdb_property = lambda p: tangodb.get_property('HDB++',p)[p]
         schema = get_hdb_property('DefaultSchema')
-        schema = schema[0] if not isinstance(schema,str) else schema
-        data = dict(l.split('=') for l in get_hdb_property(schema))
+        try:
+            print('DefaultSchema',schema)
+            schema = schema[0] if not isinstance(schema,str) else schema
+        except:
+            traceback.print_exc()
+
+        data = dict(l.split('=') for l in get_hdb_property(schema) if '=' in l)
+        print(schema,data)
         return reader(apiclass=data['apiclass'],config=data['config'])
     
     except:
         traceback.print_exc()
         logger.info(traceback.format_exc())
     
-def reader(apiclass='pyhdbpp.abstract.AbstractReader', config=None):
+def reader(apiclass='hdbpp.abstract.AbstractReader', config=None):
     """
     Initialize a reader object, based on the specified backend
     and a config dictionnary.
     """
-    
+    print('Creating hdbpp.reader(%s)' % config)
     if isinstance(config,(bytes,str)):
         
         if os.path.isfile(config):
@@ -73,6 +79,8 @@ def reader(apiclass='pyhdbpp.abstract.AbstractReader', config=None):
         else:
             config = parse_config_string(config)
             
+        print(config)
+            
         if not validate_config(config):
             logger.error(config)
             raise Exception('InvalidConfig')
@@ -93,6 +101,7 @@ def load_config_from_file(config_file):
     """
 
     try:
+        print('load_config_from_file(%s)' % config_file)
         with open(config_file, 'r') as fp:
             try:
                 config = yaml.safe_load(fp)
@@ -117,6 +126,7 @@ def load_config_from_tango(schema, root = 'HDB++', tango_host = ''):
     Current version only accept Tango Free Properties
     """
     try:
+        print('load_config_from_tango(%s)' % schema)
         schema = schema.replace('tango:','').strip('/')
         if '.' in schema:
             root,schema = schema.rsplit('.',1)
@@ -131,8 +141,9 @@ def load_config_from_tango(schema, root = 'HDB++', tango_host = ''):
     
         print(tango_host,root,schema)
         get_hdb_property = lambda p: tangodb.get_property(root,p)[p]
-        config = dict(l.split('=') for l in get_hdb_property(schema))
-          
+        config = dict(l.split('=') for l in get_hdb_property(schema) 
+                      if '=' in l)
+        
         config['database'] = config.get('database',
                             config.get('db_name',
                            config.get('dbname','hdbpp')))
@@ -154,8 +165,9 @@ def parse_config_string(connect_str):
         dict -- dictionary of values from the connect string.
     """
     try:
+        print('parse_config_str(%s)' % connect_str)
+        
         config = {}
-
         config_split, config['database'] = connect_str.split('/')
         user_pass, host_port = config_split.split('@')
         config['user'], config['password'] = user_pass.split(':')
@@ -164,6 +176,7 @@ def parse_config_string(connect_str):
         return config
     
     except Exception as e:
+        print(traceback.print_exc())
         logger.error(str(e))
         return None    
 
@@ -267,7 +280,7 @@ def read():
         logger.setLevel(logging.INFO)
 
     if args.version:
-        from pyhdbpp import version_major, version_minor, version_patch
+        from hdbpp import version_major, version_minor, version_patch
         print("Version {}.{}.{}".format(str(version_major), str(version_minor), str(version_patch)))
 
     # Build a config based on the provided information

{libhdbpp-python-0.0.22 → libhdbpp-python-0.0.31}/libhdbpp_python.egg-info/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: libhdbpp-python
-Version: 0.0.22
-Summary: Python bindings for Tango Control System Archiving
+Version: 0.0.31
+Summary: Moved to https://pypi.org/project/pyhdbpp (Python bindings for Tango Control System Archiving)
 Home-page: https://gitlab.com/tango-controls/hdbpp/libhdbpp-python
 Author: Sergi Rubio
 Author-email: srubio@cells.es
 License: LGPL-3+
-Description: hdbbpp readers for mariadb and timescaledb
-        Extract data from HDB++ Tango Archiving Systems, using either MariaDB or TimeScaleDB
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Provides-Extra: timescaledb
+License-File: LICENSE
+
+hdbbpp readers for mariadb and timescaledb
+Extract data from HDB++ Tango Archiving Systems, using either MariaDB or TimeScaleDB

libhdbpp-python-0.0.31/libhdbpp_python.egg-info/SOURCES.txt

@@ -0,0 +1,20 @@
+LICENSE
+README
+setup.cfg
+setup.py
+hdbpp/__init__.py
+hdbpp/abstract.py
+hdbpp/reader.py
+hdbpp/mariadb/__init__.py
+hdbpp/mariadb/mariadb.py
+hdbpp/mariadb/timeutils.py
+hdbpp/qt/__init__.py
+hdbpp/qt/plot.py
+hdbpp/timescaledb/__init__.py
+hdbpp/timescaledb/timescaledb.py
+libhdbpp_python.egg-info/PKG-INFO
+libhdbpp_python.egg-info/SOURCES.txt
+libhdbpp_python.egg-info/dependency_links.txt
+libhdbpp_python.egg-info/entry_points.txt
+libhdbpp_python.egg-info/requires.txt
+libhdbpp_python.egg-info/top_level.txt

{libhdbpp-python-0.0.22 → libhdbpp-python-0.0.31}/libhdbpp_python.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 hdbpp-reader = pyhdbpp.reader:read
-

libhdbpp-python-0.0.31/libhdbpp_python.egg-info/top_level.txt

@@ -0,0 +1 @@
+hdbpp

{libhdbpp-python-0.0.22 → libhdbpp-python-0.0.31}/setup.cfg

@@ -1,9 +1,9 @@
 [metadata]
-name = pyhdbpp
-version = 0.0.1
+name = hdbpp
+version = 0.0.31
 url = https://gitlab.com/tango-controls/hdbpp/libhdbpp-python
-description = HDB++ data extraction for python
-long_description = file: README.md
+description = "Moved to https://pypi.org/project/pyhdbpp (Python bindings for Tango Control System Archiving)"
+long_description = file: README
 long_description_content_type = text/markdown
 license = LGPL
 license_file = LICENSE

{libhdbpp-python-0.0.22 → libhdbpp-python-0.0.31}/setup.py

@@ -2,8 +2,8 @@
 import setuptools
 
 try:
-	import pyhdbpp
-	version = '.'.join(map(str,pyhdbpp.RELEASE))
+	import hdbpp
+	version = '.'.join(map(str,hdbpp.RELEASE))
 except:
         import traceback
         traceback.print_exc()
@@ -15,7 +15,7 @@ if __name__ == "__main__":
     version=version,
     license='LGPL-3+',
     packages=setuptools.find_packages(),
-    description="Python bindings for Tango Control System Archiving",
+    description="Moved to https://pypi.org/project/pyhdbpp (Python bindings for Tango Control System Archiving)",
     long_description="hdbbpp readers for mariadb and timescaledb\n"
     "Extract data from HDB++ Tango Archiving Systems, using either "
     "MariaDB or TimeScaleDB",

libhdbpp-python-0.0.22/README.md

@@ -1,7 +0,0 @@
-# Python HdbReader
-
-New python module for extraction from multiple hdb++ engines.
-
-For legacy archiving and full hdb++ api (MySQL only) use PyTangoArchiving instead
-
-

libhdbpp-python-0.0.22/libhdbpp_python.egg-info/SOURCES.txt

@@ -1,20 +0,0 @@
-LICENSE
-README.md
-setup.cfg
-setup.py
-libhdbpp_python.egg-info/PKG-INFO
-libhdbpp_python.egg-info/SOURCES.txt
-libhdbpp_python.egg-info/dependency_links.txt
-libhdbpp_python.egg-info/entry_points.txt
-libhdbpp_python.egg-info/requires.txt
-libhdbpp_python.egg-info/top_level.txt
-pyhdbpp/__init__.py
-pyhdbpp/abstract.py
-pyhdbpp/reader.py
-pyhdbpp/mariadb/__init__.py
-pyhdbpp/mariadb/mariadb.py
-pyhdbpp/mariadb/timeutils.py
-pyhdbpp/qt/__init__.py
-pyhdbpp/qt/plot.py
-pyhdbpp/timescaledb/__init__.py
-pyhdbpp/timescaledb/timescaledb.py

libhdbpp-python-0.0.22/libhdbpp_python.egg-info/top_level.txt

@@ -1 +0,0 @@
-pyhdbpp