MyPy fixes

Author: jeandet

tests/test_filtering.py

@@ -175,7 +175,8 @@ def test_new_syntax(self):
         event_list = get_events(~(filtering.events.s.matches(r'^Go.*') & (filtering.events.h == 30)))
         self.assertListEqual(event_list, [events[0], events[1]])
 
-
+        with self.assertRaises(ValueError):
+            get_events('start' in filtering.events)
 
     def test_get_only_manually_added_events_from_dynamic_catalogue(self):
         cat = create_catalogue('T', 'A')
@@ -188,6 +189,7 @@ def test_get_only_manually_added_events_from_dynamic_catalogue(self):
 
         assert get_events(cat, assigned_only=True)[0] == [events[1]]
 
+
 @ddt
 class TestStringListAttributes(unittest.TestCase):
     @classmethod

tscat/base.py

@@ -282,7 +282,7 @@ def create_event(start: dt.datetime, stop: dt.datetime,
                  products: Optional[Iterable[str]] = None,
                  rating: Optional[int] = None, **kwargs) -> _Event:
     """Create a new event in the database.
-    
+
     Parameters
     ----------
     start: datetime
@@ -413,11 +413,16 @@ def remove_events_from_catalogue(catalogue: Union[_Catalogue, str], events: Unio
     add_events_to_catalogue: For adding events to a catalogue.
     """
     with Session() as s:
+        if isinstance(catalogue, str):
+            c = get_catalogue(uuid=catalogue)
+            if not c:
+                raise ValueError(f"Catalogue with UUID '{catalogue}' not found.")
+            catalogue = c
         s.remove_events_from_catalogue(catalogue, events)
 
 
 def get_catalogue(uuid: Optional[str] = None, name: Optional[str] = None, predicate: Optional[Predicate] = None) -> \
-Optional[_Catalogue]:
+    Optional[_Catalogue]:
     """Get a catalogue by its UUID or name or using a predicate. If more than one catalogue matches the criteria, only the first one is returned.
 
     Parameters
@@ -441,7 +446,7 @@ def get_catalogue(uuid: Optional[str] = None, name: Optional[str] = None, predic
     """
     if sum(v is not None for v in (uuid, name, predicate)) != 1:
         raise ValueError("Exactly one of uuid, name or predicate must be provided.")
-    base_dict = {}
+    base_dict: Dict[str, Any] = {}
     if uuid:
         base_dict['uuid'] = uuid
     elif name:
@@ -451,9 +456,8 @@ def get_catalogue(uuid: Optional[str] = None, name: Optional[str] = None, predic
 
     base_dict['removed'] = False  # only get non-removed catalogues
 
-    cat = backend().get_catalogues(base_dict)
-    if len(cat):
-        cat = cat[0]
+    if (cats := backend().get_catalogues(base_dict)) and len(cats) > 0:
+        cat: Dict[Any, Any] = cats[0]
         c = _Catalogue(cat['name'], cat['author'], cat['uuid'], cat['tags'], cat['predicate'],
                        _insert=False, **cat['attributes'])
         c._backend_entity = cat['entity']

tscat/filtering.py

@@ -13,10 +13,10 @@ class _Member:
     def __init__(self, name: str):
         self.value = name
 
-    def __eq__(self, other: MemberValueType) -> 'Predicate':
+    def __eq__(self, other: MemberValueType) -> 'Predicate': # type: ignore[override]
         return Comparison('==', self, other)
 
-    def __ne__(self, other) -> 'Predicate':
+    def __ne__(self, other) -> 'Predicate': # type: ignore[override]
         return Comparison('!=', self, other)
 
     def __gt__(self, other) -> 'Predicate':
@@ -35,6 +35,7 @@ def matches(self, value: str) -> 'Predicate':
         return Match(self, value)
 
 
+
 class Field(_Member):
     def __init__(self, name: str):
         super().__init__(name)
@@ -171,25 +172,24 @@ def __init__(self, message: str):
 
 
 
-class _Catalogue:
+class _CatalogueToken:
     def __init__(self):
         pass
 
-    def __contains__(self, item: "_Event") -> Predicate:
-        return InCatalogue(item)
-
     def __getattr__(self, item) -> _Member:
         if item in ('name', 'author', 'uuid', 'tags', 'predicate', 'attributes'):
             return Field(item)
         return Attribute(item)
 
 
-class _Events:
+class _EventsToken:
     def __init__(self):
         pass
 
     def __contains__(self, item: str) -> Predicate:
-        return self[item].exists()
+        if item in ('start', 'stop', 'author', 'tags', 'products', 'rating', 'uuid'):
+            raise ValueError(f"'{item}' is always present in events, therefore cannot be used in 'in' checks.")
+        return Attribute(item).exists()
 
     def __getattr__(self, item) -> _Member:
         if item in ('start', 'stop', 'author', 'tags', 'products', 'rating', 'uuid'):
@@ -198,6 +198,6 @@ def __getattr__(self, item) -> _Member:
 
 
 # tokens to create predicates from Python code
-catalogue = _Catalogue()
-events = _Events()
+catalogue = _CatalogueToken()
+events = _EventsToken()
 event = events