Add Fetch to GQL remove REST

Author: jamesliupenn

dimo/api/__init__.py

@@ -1,7 +1,6 @@
 from .auth import Auth
 from .attestation import Attestation
 from .device_definitions import DeviceDefinitions
-from .fetch import Fetch
 from .token_exchange import TokenExchange
 from .trips import Trips
 from .valuations import Valuations
@@ -10,7 +9,6 @@
     "Auth",
     "Attestation",
     "DeviceDefinitions",
-    "Fetch",
     "TokenExchange",
     "Trips",
     "Valuations",

dimo/api/fetch.py

@@ -5,11 +5,11 @@
 from .api.conversations import Conversations
 from .api.device_definitions import DeviceDefinitions
 from .api.token_exchange import TokenExchange
-from .api.fetch import Fetch
 from .api.trips import Trips
 from .api.valuations import Valuations
 from .api.vehicle_triggers import VehicleTriggers
 
+from .graphql.fetch import Fetch
 from .graphql.identity import Identity
 from .graphql.telemetry import Telemetry
 
@@ -79,7 +79,7 @@ def __getattr__(self, name: str) -> Any:
             "auth": (Auth, ("request", "_get_auth_headers", "env", "self")),
             "conversations": (Conversations, ("request", "_get_auth_headers", "_get_full_path", "session")),
             "device_definitions": (DeviceDefinitions, ("request", "_get_auth_headers")),
-            "fetch": (Fetch, ("request", "_get_auth_headers")),
+            "fetch": (Fetch, ("self",)),
             "token_exchange": (
                 TokenExchange,
                 ("request", "_get_auth_headers", "identity", "self"),

dimo/dimo.py

@@ -5,7 +5,7 @@
         "Conversations": "https://conversations-api.dimo.zone",
         "Identity": "https://identity-api.dimo.zone/query",
         "DeviceDefinitions": "https://device-definitions-api.dimo.zone",
-        "Fetch": "https://fetch-api.dimo.zone",
+        "Fetch": "https://fetch-api.dimo.zone/query",
         "Telemetry": "https://telemetry-api.dimo.zone/query",
         "TokenExchange": "https://token-exchange-api.dimo.zone",
         "Trips": "https://trips-api.dimo.zone",
@@ -19,7 +19,7 @@
         "Conversations": "https://conversations-api.dev.dimo.zone",
         "Identity": "https://identity-api.dev.dimo.zone/query",
         "DeviceDefinitions": "https://device-definitions-api.dev.dimo.zone",
-        "Fetch": "https://fetch-api.dev.dimo.zone",
+        "Fetch": "https://fetch-api.dev.dimo.zone/query",
         "Telemetry": "https://telemetry-api.dev.dimo.zone/query",
         "TokenExchange": "https://token-exchange-api.dev.dimo.zone",
         "Trips": "https://trips-api.dev.dimo.zone",

dimo/environments.py

@@ -1,4 +1,5 @@
+from .fetch import Fetch
 from .identity import Identity
 from .telemetry import Telemetry
 
-__all__ = ["Identity", "Telemetry"]
+__all__ = ["Fetch", "Identity", "Telemetry"]

dimo/graphql/__init__.py

@@ -0,0 +1,117 @@
+class Fetch:
+    def __init__(self, dimo_instance):
+        self.dimo = dimo_instance
+
+    # Primary query method
+    def query(self, query, vehicle_jwt):
+        return self.dimo.query("Fetch", query, token=vehicle_jwt)
+
+    def get_index_keys(self, vehicle_jwt: str, did: str, limit=None, filter=None) -> dict:
+        query = """
+query GetIndexes($did: String!, $limit: Int, $filter: CloudEventFilter) {
+  indexes(did: $did, limit: $limit, filter: $filter) {
+    header {
+      id
+      source
+      producer
+      specversion
+      subject
+      time
+      type
+      datacontenttype
+      dataschema
+      dataversion
+      signature
+      tags
+    }
+    indexKey
+  }
+}"""
+        variables = {"did": did}
+        if limit is not None:
+            variables["limit"] = limit
+        if filter is not None:
+            variables["filter"] = filter
+        return self.dimo.query("Fetch", query, token=vehicle_jwt, variables=variables)
+
+    def get_latest_index_key(self, vehicle_jwt: str, did: str, filter=None) -> dict:
+        query = """
+query GetLatestIndex($did: String!, $filter: CloudEventFilter) {
+  latestIndex(did: $did, filter: $filter) {
+    header {
+      id
+      source
+      producer
+      specversion
+      subject
+      time
+      type
+      datacontenttype
+      dataschema
+      dataversion
+      signature
+      tags
+    }
+    indexKey
+  }
+}"""
+        variables = {"did": did}
+        if filter is not None:
+            variables["filter"] = filter
+        return self.dimo.query("Fetch", query, token=vehicle_jwt, variables=variables)
+
+    def get_latest_object(self, vehicle_jwt: str, did: str, filter=None) -> dict:
+        query = """
+query GetLatestCloudEvent($did: String!, $filter: CloudEventFilter) {
+  latestCloudEvent(did: $did, filter: $filter) {
+    header {
+      id
+      source
+      producer
+      specversion
+      subject
+      time
+      type
+      datacontenttype
+      dataschema
+      dataversion
+      signature
+      tags
+    }
+    data
+    dataBase64
+  }
+}"""
+        variables = {"did": did}
+        if filter is not None:
+            variables["filter"] = filter
+        return self.dimo.query("Fetch", query, token=vehicle_jwt, variables=variables)
+
+    def get_objects(self, vehicle_jwt: str, did: str, limit=None, filter=None) -> dict:
+        query = """
+query GetCloudEvents($did: String!, $limit: Int, $filter: CloudEventFilter) {
+  cloudEvents(did: $did, limit: $limit, filter: $filter) {
+    header {
+      id
+      source
+      producer
+      specversion
+      subject
+      time
+      type
+      datacontenttype
+      dataschema
+      dataversion
+      signature
+      tags
+    }
+    data
+    dataBase64
+  }
+}"""
+        variables = {"did": did}
+        if limit is not None:
+            variables["limit"] = limit
+        if filter is not None:
+            variables["filter"] = filter
+        return self.dimo.query("Fetch", query, token=vehicle_jwt, variables=variables)