Remove MaterializationClient factory (#229)

* remove factory

* possible smarter versioning

* attempt tables merge

* attempt views merge

* refactor live_live_query

caveclient/base.py

@@ -251,7 +251,10 @@ def server_version(self) -> Optional[Version]:
         """The version of the service running on the remote server. Note that this
         refers to the software running on the server and has nothing to do with the
         version of the datastack itself."""
-        return self._server_version
+        if self._server_version is None and self._api_version is not None:
+            return Version(str(self._api_version))
+        else:
+            return self._server_version
 
     @staticmethod
     def raise_for_status(r, log_warning=True):

caveclient/frameworkclient.py

@@ -10,7 +10,7 @@
 from .infoservice import InfoServiceClient
 from .jsonservice import JSONService
 from .l2cache import L2CacheClient
-from .materializationengine import MaterializationClient, MaterializationClientType
+from .materializationengine import MaterializationClient
 from .skeletonservice import SkeletonClient
 
 
@@ -515,7 +515,7 @@ def annotation(self) -> AnnotationClient:
         return self._annotation
 
     @property
-    def materialize(self) -> MaterializationClientType:
+    def materialize(self) -> MaterializationClient:
         """
         A client for the materialization service. See [client.materialize](../client_api/materialize.md)
         for more information.