Merge branch 'master' into experimental/opaque-compression

Author: jdeflander

README.md

@@ -11,7 +11,7 @@ from datetime import datetime
 from elimity_insights_client import Client, Config, ConnectorLog, Level
 
 if __name__ == "__main__":
-    config = Config(base_path="https://local.elimity.com:8081/api", token="token")
+    config = Config(url="https://local.elimity.com:8081", token="token")
     client = Client(config)
 
     timestamp = datetime.now()
@@ -31,4 +31,4 @@ $ pip install git+https://github.com/elimity-com/insights-client-python.git
 | Client version | Insights version |
 | -------------- | ---------------- |
 | 1              | 2.8 - 2.10       |
-| 2              | ^2.11            |
+| 2 - 3          | ^2.11            |

elimity_insights_client.py

@@ -92,7 +92,7 @@ def _request(
         path: str,
     ) -> Response:
         config = self._config
-        url = f"{config.base_path}/{path}"
+        url = f"{config.url}/api/{path}"
         cert = _cert(config.certificate)
         authorization = f"Bearer {config.token}"
         headers = {"Authorization": authorization, **additional_headers}
@@ -107,7 +107,7 @@ def _request(
 class Config:
     """Configuration for an Elimity Insights client."""
 
-    base_path: str
+    url: str
     token: str
     verify_ssl: bool = True
     certificate: Optional[Certificate] = None

setup.py

@@ -26,5 +26,5 @@
     python_requires=">=3.7",
     py_modules=["elimity_insights_client"],
     url="https://github.com/elimity-com/insights-client-python",
-    version="2.0.1",
+    version="3.0.0",
 )

test_elimity_insights_client.py

@@ -142,8 +142,8 @@ def _create_client(handler_class) -> Iterable[Client]:
     thread = Thread(target=server.serve_forever)
     thread.start()
 
-    base_path = f"http://localhost:{server.server_port}"
-    config = Config(base_path=base_path, token="foo")
+    url = f"http://localhost:{server.server_port}"
+    config = Config(url=url, token="foo")
     try:
         yield Client(config)
     finally:
@@ -164,7 +164,7 @@ class _CreateConnectorLogsHandler(BaseHTTPRequestHandler):
     protocol_version = "HTTP/1.1"
 
     def do_POST(self) -> None:
-        if self.path != "/custom-connector-logs":
+        if self.path != "/api/custom-connector-logs":
             self.send_error(HTTPStatus.NOT_FOUND)
             return
 
@@ -211,7 +211,7 @@ class _GetDomainGraphSchemaHandler(BaseHTTPRequestHandler):
     protocol_version = "HTTP/1.1"
 
     def do_GET(self) -> None:
-        if self.path != "/domain-graph-schema":
+        if self.path != "/api/domain-graph-schema":
             self.send_error(HTTPStatus.NOT_FOUND)
             return
 
@@ -261,7 +261,7 @@ class _ReloadDomainGraphHandler(BaseHTTPRequestHandler):
     protocol_version = "HTTP/1.1"
 
     def do_POST(self) -> None:
-        if self.path != "/custom-connector-domain-graphs":
+        if self.path != "/api/custom-connector-domain-graphs":
             self.send_error(HTTPStatus.NOT_FOUND)
             return