refactor: Updates to use nitric-api package.

Author: tjholm

nitric/api/documents.py

@@ -26,14 +26,15 @@
 
 from nitric.api.const import MAX_SUB_COLLECTION_DEPTH
 from nitric.api.exception import exception_from_grpc_error
-from nitric.proto.nitric.document.v1 import (
+from nitricapi.nitric.document.v1 import (
     DocumentServiceStub,
     Collection as CollectionMessage,
     Key as KeyMessage,
     Expression as ExpressionMessage,
     ExpressionValue,
     Document as DocumentMessage,
 )
+
 from nitric.utils import new_default_channel, _dict_from_struct, _struct_from_dict
 
 NIL_DOC_ID = ""
@@ -228,7 +229,7 @@ def is_sub_collection(self):
         return self.parent is not None
 
     def to_collection_ref(self):
-        """Return this collection group as a collection ref"""
+        """Return this collection group as a collection ref."""
         return CollectionRef(
             self._documents,
             self.name,
@@ -241,7 +242,7 @@ def to_collection_ref(self):
 
     @staticmethod
     def from_collection_ref(collectionRef: CollectionRef, documents: Documents) -> CollectionGroupRef:
-        """Return a collection ref as a collection group"""
+        """Return a collection ref as a collection group."""
         if collectionRef.parent is not None:
             return CollectionGroupRef(
                 documents,

nitric/api/events.py

@@ -24,7 +24,7 @@
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel, _struct_from_dict
-from nitric.proto.nitric.event.v1 import EventServiceStub, NitricEvent, TopicServiceStub
+from nitricapi.nitric.event.v1 import EventServiceStub, NitricEvent, TopicServiceStub
 from dataclasses import dataclass, field
 
 

nitric/api/exception.py

@@ -26,8 +26,7 @@ class NitricServiceException(Exception):
 
 
 class AbortedException(NitricServiceException):
-    """The operation was aborted, typically due to a concurrency issue such as a sequencer check failure or
-    transaction abort."""
+    """The operation was aborted, typically due to a concurrency issue such as a transaction abort."""
 
     pass
 
@@ -144,6 +143,7 @@ class UnknownException(NitricServiceException):
 
 
 def exception_from_grpc_error(error: GRPCError):
+    """Translate a gRPC error to a nitric api exception."""
     return exception_from_grpc_code(error.status.value, error.message)
 
 

nitric/api/queues.py

@@ -24,7 +24,7 @@
 
 from nitric.api.exception import FailedPreconditionException, exception_from_grpc_error, InvalidArgumentException
 from nitric.utils import new_default_channel, _struct_from_dict, _dict_from_struct
-from nitric.proto.nitric.queue.v1 import QueueServiceStub, NitricTask, FailedTask as WireFailedTask
+from nitricapi.nitric.queue.v1 import QueueServiceStub, NitricTask, FailedTask as WireFailedTask
 from dataclasses import dataclass, field
 
 

nitric/api/secrets.py

@@ -24,7 +24,7 @@
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel
-from nitric.proto.nitric.secret.v1 import SecretServiceStub, Secret as SecretMessage, SecretVersion as VersionMessage
+from nitricapi.nitric.secret.v1 import SecretServiceStub, Secret as SecretMessage, SecretVersion as VersionMessage
 
 
 class Secrets(object):

nitric/api/storage.py

@@ -22,7 +22,7 @@
 
 from nitric.api.exception import exception_from_grpc_error
 from nitric.utils import new_default_channel
-from nitric.proto.nitric.storage.v1 import StorageServiceStub
+from nitricapi.nitric.storage.v1 import StorageServiceStub
 
 
 class Storage(object):

nitric/faas/faas.py

@@ -25,7 +25,7 @@
 
 from nitric.utils import new_default_channel
 from nitric.faas import Trigger, Response
-from nitric.proto.nitric.faas.v1 import FaasServiceStub, InitRequest, ClientMessage
+from nitricapi.nitric.faas.v1 import FaasServiceStub, InitRequest, ClientMessage
 import asyncio
 
 Handler = Callable[

nitric/faas/response.py

@@ -19,8 +19,8 @@
 import json
 from dataclasses import dataclass, field
 from typing import Union, Any
-from nitric.proto.nitric.faas import v1
-from nitric.proto.nitric.faas.v1 import TriggerResponse
+from nitricapi.nitric.faas import v1
+from nitricapi.nitric.faas.v1 import TriggerResponse
 
 
 @dataclass(order=True)

nitric/faas/trigger.py

@@ -21,7 +21,7 @@
 
 import betterproto
 
-from nitric.proto.nitric.faas.v1 import TriggerRequest
+from nitricapi.nitric.faas.v1 import TriggerRequest
 from nitric.faas.response import Response, TopicResponseContext, HttpResponseContext, ResponseContext
 
 
@@ -94,9 +94,14 @@ def from_trigger_request(trigger_request: TriggerRequest):
         """Return a TriggerContext from a TriggerRequest."""
         context_type, context = betterproto.which_one_of(trigger_request, "context")
         if context_type == "http":
+            if len(trigger_request.http.headers.keys()) > 0:
+                new_headers = {k: v[0].value for (k, v) in trigger_request.http.headers.items()}
+            else:
+                new_headers = trigger_request.http.headers_old
+
             return TriggerContext(
                 context=HttpTriggerContext(
-                    headers=trigger_request.http.headers,
+                    headers=new_headers,
                     method=trigger_request.http.method,
                     query_params=trigger_request.http.query_params,
                     path=trigger_request.http.path,

tests/api/test_documents.py

@@ -34,7 +34,7 @@
     QueryResultsPage,
 )
 from nitric.api.exception import UnknownException
-from nitric.proto.nitric.document.v1 import (
+from nitricapi.nitric.document.v1 import (
     Key,
     Collection,
     DocumentGetResponse,
@@ -44,7 +44,7 @@
     ExpressionValue,
     DocumentQueryStreamResponse,
 )
-from nitric.proto.nitric.event.v1 import TopicListResponse, NitricTopic
+from nitricapi.nitric.event.v1 import TopicListResponse, NitricTopic
 from nitric.utils import _struct_from_dict
 
 
@@ -56,7 +56,7 @@ class DocumentsClientTest(IsolatedAsyncioTestCase):
     async def test_set_document(self):
         mock_set = AsyncMock()
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.set", mock_set):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.set", mock_set):
             await Documents().collection("a").doc("b").set({"a": 1})
 
         mock_set.assert_called_once_with(
@@ -74,7 +74,7 @@ async def test_set_document(self):
     async def test_set_subcollection_document(self):
         mock_set = AsyncMock()
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.set", mock_set):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.set", mock_set):
             await Documents().collection("a").doc("b").collection("c").doc("d").set({"a": 1})
 
         mock_set.assert_called_once_with(
@@ -108,7 +108,7 @@ async def test_get_document(self):
             ),
         )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.get", mock_get):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.get", mock_get):
             response = await Documents().collection("a").doc("b").get()
 
         mock_get.assert_called_once_with(
@@ -139,7 +139,7 @@ async def test_get_subcollection_document(self):
             ),
         )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.get", mock_get):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.get", mock_get):
             response: SdkDocument = await Documents().collection("a").doc("b").collection("c").doc("d").get()
 
         mock_get.assert_called_once_with(
@@ -163,7 +163,7 @@ async def test_get_subcollection_document(self):
     async def test_delete_document(self):
         mock_delete = AsyncMock()
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
             await Documents().collection("a").doc("b").delete()
 
         mock_delete.assert_called_once_with(
@@ -176,7 +176,7 @@ async def test_delete_document(self):
     async def test_delete_subcollection_document(self):
         mock_delete = AsyncMock()
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
             await Documents().collection("a").doc("b").collection("c").doc("d").delete()
 
         mock_delete.assert_called_once_with(
@@ -231,7 +231,7 @@ async def test_collection_query_fetch(self):
             paging_token={"b": "c"},
         )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query", mock_query):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.query", mock_query):
             results = (
                 await Documents()
                 .collection("a")
@@ -272,7 +272,7 @@ async def test_subcollection_query_fetch(self):
             paging_token={"b": "c"},
         )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query", mock_query):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.query", mock_query):
             results = (
                 await Documents()
                 .collection("a")
@@ -323,7 +323,7 @@ async def mock_stream(self, **kwargs):
                     document=Document(content=Struct(fields={"a": Value(number_value=i)}))
                 )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query_stream", mock_stream):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.query_stream", mock_stream):
             results = []
             async for result in Documents().collection("a").query().where("name", "startsWith", "test").stream():
                 results.append(result)
@@ -347,31 +347,31 @@ async def test_set_document_error(self):
         mock_set = AsyncMock()
         mock_set.side_effect = GRPCError(Status.UNKNOWN, "test error")
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.set", mock_set):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.set", mock_set):
             with pytest.raises(UnknownException) as e:
                 await Documents().collection("a").doc("b").set({"a": 1})
 
     async def test_get_document_error(self):
         mock_get = AsyncMock()
         mock_get.side_effect = GRPCError(Status.UNKNOWN, "test error")
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.get", mock_get):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.get", mock_get):
             with pytest.raises(UnknownException) as e:
                 await Documents().collection("a").doc("b").get()
 
     async def test_delete_document_error(self):
         mock_delete = AsyncMock()
         mock_delete.side_effect = GRPCError(Status.UNKNOWN, "test error")
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.delete", mock_delete):
             with pytest.raises(UnknownException) as e:
                 await Documents().collection("a").doc("b").delete()
 
     async def test_query_fetch_error(self):
         mock_fetch = AsyncMock()
         mock_fetch.side_effect = GRPCError(Status.UNKNOWN, "test error")
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query", mock_fetch):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.query", mock_fetch):
             with pytest.raises(UnknownException) as e:
                 await Documents().collection("a").query().fetch()
 
@@ -390,7 +390,7 @@ async def mock_stream(self, **kwargs):
                     document=Document(content=Struct(fields={"a": Value(number_value=i)}))
                 )
 
-        with patch("nitric.proto.nitric.document.v1.DocumentServiceStub.query_stream", mock_stream):
+        with patch("nitricapi.nitric.document.v1.DocumentServiceStub.query_stream", mock_stream):
             with pytest.raises(UnknownException) as e:
                 async for result in Documents().collection("a").query().stream():
                     assert False