Support for other endpoints and bump minor version

Author: Donnype

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xtdb"
-version = "0.1.1"
+version = "0.2.0"
 packages = [{ include = "xtdb" }]
 include  = ["xtdb/**"]
 exclude = [

tests/integration/test_xtdb_session.py

@@ -53,6 +53,8 @@ def test_query_simple_filter(xtdb_session: XTDBSession):
     result = xtdb_session.query(query, tx_id=0)
     assert result[0].dict() == {"TestEntity/name": "test", "type": "TestEntity", "xt/id": entity.id}
 
+    xtdb_session.client.sync()
+
     xtdb_session.delete(entity)
     xtdb_session.commit()
 
@@ -199,6 +201,19 @@ def test_deep_queries(xtdb_session: XTDBSession):
         "SecondEntity/test_entity": test.id,
     }
 
+    attribute_stats = xtdb_session.client.get_attribute_stats()
+    assert attribute_stats == {
+        "FourthEntity/third_entity": 1,
+        "FourthEntity/value": 1,
+        "SecondEntity/age": 4,
+        "SecondEntity/test_entity": 4,
+        "TestEntity/name": 8,
+        "ThirdEntity/second_entity": 1,
+        "ThirdEntity/test_entity": 1,
+        "type": 14,
+        "xt/id": 14,
+    }
+
     xtdb_session.delete(fourth)
     xtdb_session.delete(third)
     xtdb_session.delete(second2)
@@ -385,9 +400,61 @@ def test_get_entity_transactions(xtdb_session: XTDBSession):
     result = xtdb_session.client.get_entity_transactions(test.id, tx_id=result["txId"] - 1)
     assert result["validTime"] == "1000-10-10T00:00:00Z"
 
-    # TODO: check these:
+    # TODO: check transaction time
 
     result = xtdb_session.client.get_entity_transactions(test.id, valid_time=datetime(1000, 10, 10))
     assert result["validTime"] == "1000-10-10T00:00:00Z"
 
     xtdb_session.delete(test)
+
+
+def test_transaction_api(xtdb_session: XTDBSession):
+    test = TestEntity(name="test")
+    second = SecondEntity(test_entity=test, age=1)
+    second2 = SecondEntity(test_entity=test, age=4)
+
+    xtdb_session.put(test)
+    xtdb_session.put(second)
+    xtdb_session.put(second2)
+    xtdb_session.commit()
+
+    result = xtdb_session.client.get_transaction_log()
+    assert len(result) == 28
+    assert list(result[0].keys()) == ["txId", "txTime", "txEvents"]
+
+    result = xtdb_session.client.get_transaction_log(10)
+    assert len(result) == 18
+
+    result = xtdb_session.client.get_transaction_log(10, True)
+    assert len(result) == 18
+    assert list(result[0].keys()) == ["txId", "txTime", "txOps"]
+
+    result = xtdb_session.client.get_transaction_committed(10)
+    assert result == {"txCommitted?": True}
+
+    result = xtdb_session.client.get_latest_completed_transaction()
+    assert result["txId"] == 28
+
+    result = xtdb_session.client.get_latest_submitted_transaction()
+    assert result["txId"] == 28
+
+    result = xtdb_session.client.get_active_queries()
+    assert result == []
+
+    query = Query(SecondEntity).where(SecondEntity, age=1)
+    xtdb_session.query(query)
+
+    result = xtdb_session.client.get_recent_queries()
+    assert result[0]["error"] is None
+    assert (
+        result[0]["query"] == "{:find [(pull SecondEntity [*])], :where [[SecondEntity :SecondEntity/age 1] "
+        '[SecondEntity :type "SecondEntity"]]}'
+    )
+
+    result = xtdb_session.client.get_slowest_queries()
+    assert result == []
+
+    xtdb_session.delete(second2)
+    xtdb_session.delete(second)
+    xtdb_session.delete(test)
+    xtdb_session.commit()

xtdb/session.py

@@ -202,6 +202,23 @@ def get_entity_history(
         self._verify_response(res)
         return res.json()
 
+    def get_attribute_stats(self):
+        res = self._session.get(f"{self.base_url}/attribute-stats")
+        self._verify_response(res)
+
+        return res.json()
+
+    def sync(self, timeout: Optional[int] = None):
+        params = {}
+
+        if timeout is not None:
+            params["timeout"] = timeout
+
+        res = self._session.get(f"{self.base_url}/sync", params=params)
+        self._verify_response(res)
+
+        return res.json()
+
     def query(
         self,
         query: Union[str, Query],
@@ -230,9 +247,35 @@ def query(
         self._verify_response(res)
         return res.json()
 
-    def await_transaction(self, transaction_id: int) -> None:
-        self._session.get(f"{self.base_url}/await-tx", params={"txId": transaction_id})
-        logger.info("Transaction completed [txId=%s]", transaction_id)
+    def await_transaction(self, tx_id: int, timeout: Optional[int] = None) -> None:
+        params = {"txId": tx_id}
+
+        if timeout is not None:
+            params["timeout"] = timeout
+
+        self._session.get(f"{self.base_url}/await-tx", params=params)
+
+    def await_transaction_time(self, tx_time: datetime, timeout: Optional[int] = None) -> None:
+        params = {"tx-time": tx_time.isoformat()}
+
+        if timeout is not None:
+            params["timeout"] = str(timeout)
+
+        self._session.get(f"{self.base_url}/await-tx-time", params=params)
+
+    def get_transaction_log(self, after_tx_id: Optional[int] = None, with_ops: Optional[bool] = None):
+        params = {}
+
+        if after_tx_id is not None:
+            params["after-tx-id"] = str(after_tx_id)
+
+        if with_ops is not None:
+            params["with-ops?"] = str(with_ops).lower()
+
+        res = self._session.get(f"{self.base_url}/tx-log", params=params)
+        self._verify_response(res)
+
+        return res.json()
 
     def submit_transaction(self, transaction: Union[Transaction, List]) -> None:
         if isinstance(transaction, list):
@@ -247,6 +290,42 @@ def submit_transaction(self, transaction: Union[Transaction, List]) -> None:
         self._verify_response(res)
         self.await_transaction(res.json()["txId"])
 
+    def get_transaction_committed(self, tx_id: int):
+        res = self._session.get(f"{self.base_url}/tx-committed", params={"tx-id": tx_id})
+
+        self._verify_response(res)
+        return res.json()
+
+    def get_latest_completed_transaction(self):
+        res = self._session.get(f"{self.base_url}/latest-completed-tx")
+
+        self._verify_response(res)
+        return res.json()
+
+    def get_latest_submitted_transaction(self):
+        res = self._session.get(f"{self.base_url}/latest-submitted-tx")
+
+        self._verify_response(res)
+        return res.json()
+
+    def get_active_queries(self):
+        res = self._session.get(f"{self.base_url}/active-queries")
+
+        self._verify_response(res)
+        return res.json()
+
+    def get_recent_queries(self):
+        res = self._session.get(f"{self.base_url}/recent-queries")
+
+        self._verify_response(res)
+        return res.json()
+
+    def get_slowest_queries(self):
+        res = self._session.get(f"{self.base_url}/slowest-queries")
+
+        self._verify_response(res)
+        return res.json()
+
 
 class XTDBSession:
     def __init__(self, base_url: str):