Update for frontend library

kyungeonchoi · Apr 23, 2022 · 2e4cdf5 · 2e4cdf5
1 parent fcd6719
commit 2e4cdf5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ServiceX DataBinder
 
-<p align="right"> Release v0.2.6 </p>
+<p align="right"> Release v0.2.7 </p>
 
 [![PyPI version](https://badge.fury.io/py/servicex-databinder.svg)](https://badge.fury.io/py/servicex-databinder)
 

diff --git a/servicex_databinder/__init__.py b/servicex_databinder/__init__.py
@@ -2,7 +2,7 @@
 
 from .servicex_databinder import DataBinder
 
-__version__ = '0.2.6'
+__version__ = '0.2.7'
 
 logging.basicConfig(format="%(levelname)s - %(message)s")
 logging.getLogger(__name__).setLevel(logging.INFO)
diff --git a/servicex_databinder/frontend.py b/servicex_databinder/frontend.py
@@ -43,10 +43,11 @@ def get_servicex_data(self, test_run=False):
 
         nest_asyncio.apply()
 
-        async def bound_get_data(sem, sx_ds, query):
+        # async def bound_get_data(sem, sx_ds, query):
+        async def bound_get_data(sem, sx_ds, query, sample):
             async with sem:
-                return await sx_ds.get_data_parquet_async(query)
-                # return await sx_ds.get_data_parquet_async(query, 'test') # When fix in ServiceX Frontend
+                # return await sx_ds.get_data_parquet_async(query)
+                return await sx_ds.get_data_parquet_async(query, sample) # When fix in ServiceX Frontend
 
         async def _get_my_data():
             sem = asyncio.Semaphore(50) # Limit maximum concurrent ServiceX requests
@@ -60,8 +61,10 @@ async def _get_my_data():
                                             session_generator=session, \
                                             ignore_cache=ignoreCache)
                     query = request['query']
+                    sample = request['Sample']
 
-                    task = asyncio.ensure_future(bound_get_data(sem, sx_ds, query))
+                    # task = asyncio.ensure_future(bound_get_data(sem, sx_ds, query))
+                    task = asyncio.ensure_future(bound_get_data(sem, sx_ds, query, sample))
                     tasks.append(task)
                 return await asyncio.gather(*tasks)
 

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def get_version(rel_path):
                  license="BSD 3-clause",
                  python_requires='>=3.6',
                  install_requires=[
-                    "servicex>=2.4,<2.5",
+                    "servicex>=2.5",
                     "tcut-to-qastle>=0.6",                    
                     "nest-asyncio>=1.5.1",                
                     "tqdm>=4.60.0",