deriva 1.7.9__py3-none-any.whl → 1.7.10__py3-none-any.whl

deriva/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.9"
+__version__ = "1.7.10"
 
 from deriva.core.utils.core_utils import *
 from deriva.core.base_cli import BaseCLI, KeyValuePairArgs

deriva/core/datapath.py

@@ -11,7 +11,8 @@ from requests import HTTPError
 import warnings
 from . import DEFAULT_HEADERS, ermrest_model as _erm
 
-__all__ = ['DataPathException', 'Min', 'Max', 'Sum', 'Avg', 'Cnt', 'CntD', 'Array', 'ArrayD', 'Bin']
+__all__ = ['DataPathException', 'Min', 'Max', 'Sum', 'Avg', 'Cnt', 'CntD', 'Array', 'ArrayD', 'Bin', 'All', 'Any',
+           'simple_denormalization', 'simple_denormalization_with_whole_entities']
 
 logger = logging.getLogger(__name__)
 """Logger for this module"""
@@ -1265,6 +1266,19 @@ class _ColumnWrapper (object):
 
     __eq__ = eq
 
+    def ne(self, other):
+        """Returns a 'not equal' comparison predicate.
+
+        :param other: `None` or any other literal value.
+        :return: a filter predicate object
+        """
+        if other is None:
+            return _ComparisonPredicate(self, "::null::", '').negate()
+        else:
+            return _ComparisonPredicate(self, "=", other).negate()
+
+    __ne__ = ne
+
     def lt(self, other):
         """Returns a 'less than' comparison predicate.
 
@@ -1311,8 +1325,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'regexp' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::regexp::", other)
 
     def ciregexp(self, other):
@@ -1321,8 +1333,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'ciregexp' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::ciregexp::", other)
 
     def ts(self, other):
@@ -1331,8 +1341,6 @@ class _ColumnWrapper (object):
         :param other: a _string_ literal value.
         :return: a filter predicate object
         """
-        if not isinstance(other, str):
-            logger.warning("'ts' method comparison only supports string literals.")
         return _ComparisonPredicate(self, "::ts::", other)
 
     def alias(self, name):
@@ -1395,6 +1403,16 @@ class _ColumnAlias (object):
 
     __eq__ = eq
 
+    def ne(self, other):
+        """Returns a 'not equal' comparison predicate.
+
+        :param other: `None` or any other literal value.
+        :return: a filter predicate object
+        """
+        return self._base_column.ne(other)
+
+    __ne__ = ne
+
     def lt(self, other):
         """Returns a 'less than' comparison predicate.
 
@@ -1713,7 +1731,7 @@ class _ComparisonPredicate (_Predicate):
         assert isinstance(lop, _ColumnWrapper)
         assert isinstance(rop, _ColumnWrapper) or isinstance(rop, int) or \
                isinstance(rop, float) or isinstance(rop, str) or \
-               isinstance(rop, date)
+               isinstance(rop, date) or isinstance(rop, _Quantifier)
         assert isinstance(op, str)
         self._lop = lop
         self._op = op
@@ -1739,6 +1757,9 @@ class _ComparisonPredicate (_Predicate):
         if isinstance(self._rop, _ColumnWrapper):
             # The only valid circumstance for a _ColumnWrapper rop is in a link 'on' predicate for simple key/fkey joins
             return "(%s)=(%s)" % (self._lop._instancename, self._rop._fqname)
+        elif isinstance(self._rop, _Quantifier):
+            # Quantifiers can be trusted to properly urlquote their literals
+            return "%s%s%s" % (self._lop._instancename, self._op, str(self._rop))
         else:
             # All other comparisons are serialized per the usual form
             return "%s%s%s" % (self._lop._instancename, self._op, urlquote(str(self._rop)))
@@ -1810,6 +1831,34 @@ class _NegationPredicate (_Predicate):
         return "!(%s)" % self._child
 
 
+class _Quantifier (object):
+    """Base class of quantifiers."""
+    def __init__(self, quantifier_name, *args):
+        """Initializes the quantifier object.
+
+        :param quantifier_name: name of the quantifier per ERMrest specification.
+        :param args: arguments of the quantifier per ERMrest specification.
+        """
+        super(_Quantifier, self).__init__()
+        self._quantifier_name = quantifier_name
+        self._args = args
+
+    def __str__(self):
+        return "%s(%s)" % (self._quantifier_name, ','.join([urlquote(str(arg)) for arg in self._args]))
+
+
+class All (_Quantifier):
+    """Universal quantifier."""
+    def __init__(self, *args):
+        super(All, self).__init__('all', *args)
+
+
+class Any (_Quantifier):
+    """Existential quantifier."""
+    def __init__(self, *args):
+        super(Any, self).__init__('any', *args)
+
+
 class AggregateFunction (object):
     """Base class of all aggregate functions."""
     def __init__(self, fn_name, arg):

{deriva-1.7.9.dist-info → deriva-1.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva
-Version: 1.7.9
+Version: 1.7.10
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division

{deriva-1.7.9.dist-info → deriva-1.7.10.dist-info}/RECORD

@@ -8,11 +8,11 @@ deriva/config/dump_catalog_annotations.py,sha256=QzaWDLfWIAQ0eWVV11zeceWgwDBOYIe
 deriva/config/rollback_annotation.py,sha256=vqrIcen-KZX8LDpu2OVNivzIHpQoQgWkZAChZJctvtk,3015
 deriva/config/examples/group_owner_policy.json,sha256=8v3GWM1F_BWnYD9x_f6Eo4kBDvyy8g7mRqujfoEKLNc,2408
 deriva/config/examples/self_serve_policy.json,sha256=pW-cqWz4rJNNXwY4eVZFkQ8gKCHclC9yDa22ylfcDqY,1676
-deriva/core/__init__.py,sha256=NKiBln9VluAuOX25MSfa-xDpYY86NwJY1civQ_Kg5QY,4975
+deriva/core/__init__.py,sha256=2YJow_azmav6XbSDKH_fIO7or9_VyHdN1Od8_H-T964,4976
 deriva/core/annotation.py,sha256=PkAkPkxX1brQsb8_drR1Qj5QjQA5mjkpXhkq9NuZ1g8,13432
 deriva/core/base_cli.py,sha256=78Ilf3_f2xREQb3IIj6q0jwWAiXSObZszG0JURs36lA,2902
 deriva/core/catalog_cli.py,sha256=CwfTf7C81SpU1J_aPsWiIbPOBAyekkIh384KUivq5H8,23550
-deriva/core/datapath.py,sha256=w8LvPAd_DuknKxHc_YS6NUHhTY6XpCSkfa0m_xQUdZE,89068
+deriva/core/datapath.py,sha256=h9WzLipAYctppoiZehyDNJdFpCnbU9-z-AWVD80z2Pk,90525
 deriva/core/deriva_binding.py,sha256=6yGXIbnayDtb9LU-JVK43zk02-aQwshrKiaLi1pru-8,13086
 deriva/core/deriva_server.py,sha256=nsW3gwg1sIaHl3BTf-nL41AkSj3dEpcEBlatvjvN8CQ,200
 deriva/core/ermrest_catalog.py,sha256=2mShQgo35DIQ-0UOEqu2VgCDTE3sUrQSWVDm1jW_tQ8,55547
@@ -97,10 +97,10 @@ deriva/transfer/upload/processors/metadata_update_processor.py,sha256=Hgu5huZf7Z
 deriva/transfer/upload/processors/rename_processor.py,sha256=UQ-JQuQgyYCGT-fU9kHA53kPdQ20kt-2Bb486od7B14,2423
 deriva/transfer/upload/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/utils/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
-deriva-1.7.9.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+deriva-1.7.10.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
 tests/deriva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/deriva/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/deriva/core/test_datapath.py,sha256=0vUlQ48KYkDW5L7hzwyGAETa_40y0JmZDalk0W0fCq4,38722
+tests/deriva/core/test_datapath.py,sha256=ft7qDp9peomnhtREry5et4QDO4RyfCCBSE6YnNDNYe8,40225
 tests/deriva/core/test_ermrest_model.py,sha256=tmWmAgXTcLBueY4iUS14uq-b1SjgKMaFGt2lw9mYvbg,34330
 tests/deriva/core/mmo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/deriva/core/mmo/base.py,sha256=3iLqUDNdiJaERB-8-G-5NEvkJr9fz0YUMvPxl5hMINE,9356
@@ -109,8 +109,8 @@ tests/deriva/core/mmo/test_mmo_find.py,sha256=PcUN76sik68B3XKg0G3wHVpKcPEld_6Rtb
 tests/deriva/core/mmo/test_mmo_prune.py,sha256=4pYtYL8g1BgadlewNPVpVA5lT_gV6SPTDYf04ZKzBTA,6851
 tests/deriva/core/mmo/test_mmo_rename.py,sha256=4oSR1G3Od701Ss3AnolI1Z7CbMxKuQF2uSr2_IcoR6s,8512
 tests/deriva/core/mmo/test_mmo_replace.py,sha256=w-66LWyiQ_ajC7Ipmhc4kAKwIloPdQELeUPsvelTdX8,8439
-deriva-1.7.9.dist-info/METADATA,sha256=QXs8Ca5GdL-Sw7SY41j0tYR5maXv16epbvoIoH6SnNU,1890
-deriva-1.7.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deriva-1.7.9.dist-info/entry_points.txt,sha256=HmYCHlgbjYQ_aZX_j4_4tApH4tDTbYtS66jKlfytbn8,850
-deriva-1.7.9.dist-info/top_level.txt,sha256=_LHDie5-O53wFlexfrxjewpVkf04oydf3CqX5h75DXE,13
-deriva-1.7.9.dist-info/RECORD,,
+deriva-1.7.10.dist-info/METADATA,sha256=OrMw19lEt6tH9VyJq5a8wL4WpeIu-Wr1a8rjrJLKNdk,1891
+deriva-1.7.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+deriva-1.7.10.dist-info/entry_points.txt,sha256=HmYCHlgbjYQ_aZX_j4_4tApH4tDTbYtS66jKlfytbn8,850
+deriva-1.7.10.dist-info/top_level.txt,sha256=_LHDie5-O53wFlexfrxjewpVkf04oydf3CqX5h75DXE,13
+deriva-1.7.10.dist-info/RECORD,,

{deriva-1.7.9.dist-info → deriva-1.7.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/deriva/core/test_datapath.py

@@ -10,10 +10,8 @@ import logging
 from operator import itemgetter
 import os
 import unittest
-import sys
 from deriva.core import DerivaServer, get_credential, ermrest_model as _em, __version__
-from deriva.core.datapath import DataPathException, Min, Max, Sum, Avg, Cnt, CntD, Array, ArrayD, Bin, \
-    simple_denormalization_with_whole_entities
+from deriva.core.datapath import *
 
 try:
     from pandas import DataFrame
@@ -575,10 +573,28 @@ class DatapathTests (unittest.TestCase):
                 self.assertEqual(expected_results_len, len(results))
 
     def test_filter_equality(self):
+        # test with value
         results = self.experiment.filter(
             self.experiment.column_definitions['Name'] == TEST_EXP_NAME_FORMAT.format(1)
         ).entities()
         self.assertEqual(len(results), 1)
+        # test again with null
+        results = self.experiment.filter(
+            self.experiment.column_definitions['Name'] == None
+        ).entities()
+        self.assertEqual(len(results), 0)
+
+    def test_filter_notequal(self):
+        # test with value
+        results = self.experiment.filter(
+            self.experiment.column_definitions['Amount'] != 0
+        ).entities()
+        self.assertEqual(len(results), TEST_EXP_MAX-1)
+        # test again with null
+        results = self.experiment.filter(
+            self.experiment.column_definitions['Amount'] != None
+        ).entities()
+        self.assertEqual(len(results), TEST_EXP_MAX)
 
     def test_filter_inequality(self):
         results = self.experiment.filter(
@@ -592,6 +608,24 @@ class DatapathTests (unittest.TestCase):
         ).entities()
         self.assertEqual(len(results), 1)
 
+    @unittest.skipUnless(TEST_EXP_MAX >= 3, "this test was designed for at least 3 elements in the test set")
+    def test_fitler_w_quantifier(self):
+        int_args = [0, int(TEST_EXP_MAX/2), TEST_EXP_MAX-1, TEST_EXP_MAX*2]
+        str_args = [TEST_EXP_NAME_FORMAT.format(i) for i in int_args]
+        for name, cname, Q, args, expectation in [
+            ('any_3_ints', 'Amount', Any, int_args, 3),
+            ('all_1_int', 'Amount', All, [int_args[0]], 1),
+            ('all_3_ints', 'Amount', All, int_args, 0),
+            ('any_3_strs', 'Name', Any, str_args, 3),
+            ('all_1_str', 'Name', All, [str_args[0]], 1),
+            ('all_3_strs', 'Name', All, str_args, 0)
+        ]:
+            with self.subTest(name=name):
+                results = self.experiment.filter(
+                    self.experiment.column_definitions[cname] == Q(*args)
+                ).entities()
+                self.assertEqual(len(results), expectation)
+
     def test_filter_negation(self):
         results = self.experiment.filter(
             ~ (self.experiment.column_definitions['Name'].ciregexp(TEST_EXP_NAME_FORMAT.format(0)[10:]))