[das-query-engine#333] Review the way our libraries are checked in cl…

…ient/server connection (#155)

* das-query-engine-333: Move handshake validation to the client-side.

* Update CHANGELOG file

* das-query-engine-333: remove unecessary files

* das-query-engine-333: fix unit tests

* das-query-engine-333: Update CHANGELOG file

CHANGELOG

@@ -1 +1,2 @@
 [HOTFIX] Fixes after DAS api change in atom-db/#216
+[das-query-engine#333] Move handshake validation to the client-side. The server will now only send the expected library versions.

das-query-engine/action_mapper.py

@@ -17,7 +17,6 @@
     GetLinkValidator,
     GetNodeByNameStartingWith,
     GetNodeValidator,
-    HandshakeValidator,
     QueryValidator,
 )
 
@@ -36,7 +35,7 @@ def _build_dispatcher(self):
             },
             ActionType.HANDSHAKE: {
                 "action": actions.handshake,
-                "validator": HandshakeValidator,
+                "validator": None,
             },
             ActionType.COUNT_ATOMS: {
                 "action": actions.count_atoms,

das-query-engine/actions.py

@@ -10,7 +10,6 @@
 import hyperon_das.link_filters as link_filters
 from hyperon_das_atomdb import exceptions as atom_db_exceptions
 from utils.decorators import execution_time_tracker, remove_none_args
-from utils.version import compare_minor_versions
 
 
 class ActionType(str, Enum):
@@ -62,29 +61,10 @@ def ping(self) -> Tuple[dict, int]:
         return dict(message="pong"), HTTPStatus.OK
 
     @execution_time_tracker
-    def handshake(self, das_version: str, atomdb_version: str) -> Tuple[dict, int]:
+    def handshake(self) -> Tuple[dict, int]:
         remote_info = self.das.about()
         http_status_code = HTTPStatus.OK
 
-        remote_das_version = remote_info["das"]["version"]
-        remote_atomdb_version = remote_info["atom_db"]["version"]
-
-        comparison_das_version_result = compare_minor_versions(remote_das_version, das_version)
-        if comparison_das_version_result is None or comparison_das_version_result != 0:
-            logger().error(
-                f"The version sent by the on-premises Hyperon-DAS is {das_version}, but the expected version on the remote server is {remote_das_version}."
-            )
-            http_status_code = HTTPStatus.CONFLICT
-
-        comparison_atomdb_version_result = compare_minor_versions(
-            remote_atomdb_version, atomdb_version
-        )
-        if comparison_atomdb_version_result is None or comparison_atomdb_version_result != 0:
-            logger().error(
-                f"The version sent by the on-premises Hyperon-DAS-AtomDB is {atomdb_version}, but the expected version on the remote server is {remote_atomdb_version}."
-            )
-            http_status_code = HTTPStatus.CONFLICT
-
         return remote_info, http_status_code
 
     @execution_time_tracker

das-query-engine/tests/unit/test_action_mapper.py

@@ -16,7 +16,7 @@ def test_build_dispatcher_handshake_action():
 
     assert isinstance(dispatchers, dict)
     assert dispatchers[ActionType.HANDSHAKE]["action"] == expected_actions.handshake
-    assert hasattr(dispatchers[ActionType.HANDSHAKE]["validator"], "validate")
+    assert dispatchers[ActionType.PING]["validator"] is None
 
 
 def test_build_dispatcher_ping_action():

das-query-engine/validators/actions.py

@@ -1,13 +1,6 @@
 from incoming import PayloadValidator, datatypes
 
 
-class HandshakeValidator(PayloadValidator):
-    strict = True
-
-    das_version = datatypes.String(required=True)
-    atomdb_version = datatypes.String(required=True)
-
-
 class GetAtomValidator(PayloadValidator):
     strict = True