Fix a few symbol name errors

Author: velovix

brainframe/api/bf_codecs/alarm_codecs.py

@@ -114,4 +114,3 @@ def from_dict(d):
                      start_time=d["start_time"],
                      end_time=d["end_time"],
                      verified_as=d["verified_as"])
-

brainframe/api/bf_codecs/condition_codecs.py

@@ -108,7 +108,7 @@ def from_dict(d: dict):
         with_attribute = None
         if d["with_attribute"] is not None:
             with_attribute = Attribute.from_dict(d["with_attribute"])
-        test = ZoneAlarmCountCondition.TestType(d["test"])
+        test = CountConditionTestType(d["test"])
 
         return ZoneAlarmCountCondition(
             test=test,
@@ -210,13 +210,13 @@ def from_dict(d: dict):
         with_attribute = None
         if d["with_attribute"] is not None:
             with_attribute = Attribute.from_dict(d["with_attribute"])
-        test = ZoneAlarmRateCondition.TestType(d["test"])
+        test = RateConditionTestType(d["test"])
 
         return ZoneAlarmRateCondition(
             test=test,
             duration=d["duration"],
             change=d["change"],
-            direction=ZoneAlarmRateCondition.DirectionType(d["direction"]),
+            direction=DirectionType(d["direction"]),
             with_class_name=d["with_class_name"],
             with_attribute=with_attribute,
             intersection_point=intersection_point,

brainframe/api/bf_codecs/license_codecs.py

@@ -88,7 +88,7 @@ def from_dict(d: dict) -> "LicenseInfo":
             terms = LicenseTerms.from_dict(d["terms"])
 
         return LicenseInfo(
-            state=LicenseInfo.State(d["state"]),
+            state=LicenseState(d["state"]),
             terms=terms,
         )
 

brainframe/api/bf_codecs/plugin_codecs.py

@@ -149,7 +149,7 @@ def to_dict(self):
 
     @staticmethod
     def from_dict(d):
-        size = NodeDescription.SizeType(d["size"])
+        size = SizeType(d["size"])
         return NodeDescription(
             size=size,
             detections=d["detections"],

brainframe/api/bf_codecs/user_codecs.py

@@ -49,6 +49,6 @@ def from_dict(d: dict):
         return User(
             username=d["username"],
             password=d["password"],
-            role=User.RoleType(d["role"]),
+            role=RoleType(d["role"]),
             id_=d["id"],
         )

brainframe/api/stub.py

@@ -3,7 +3,8 @@
 
 from requests.exceptions import ConnectionError, ReadTimeout
 
-from brainframe.api.bf_errors import UnauthorizedError, UnknownError
+from .bf_errors import UnauthorizedError, UnknownError
+from .bf_codecs import LicenseState
 from . import stubs
 from .stubs.base_stub import DEFAULT_TIMEOUT
 
@@ -62,7 +63,7 @@ def wait_for_server_initialization(self, timeout: int = None):
                 # TODO: Remove this check and let the user know about the
                 #       license not being valid
                 license_info = self.get_license_info()
-                if license_info.state is license_info.State.VALID:
+                if license_info.state is LicenseState.VALID:
                     break
             except (ConnectionError, ConnectionRefusedError,
                     UnauthorizedError, ReadTimeout):

brainframe/api/stubs/analysis.py

@@ -39,4 +39,3 @@ def check_analyzing(self, stream_id,
         req = f"/api/streams/{stream_id}/analyze"
         resp, _ = self._get_json(req, timeout)
         return resp
-