LEXIO-37880 Caches properties, includes test for quote in string (#3)

Author: jdrake

crma_api_client/__init__.py

@@ -2,4 +2,4 @@
 
 from .client import CRMAAPIClient
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"

crma_api_client/resources/query.py

@@ -2,6 +2,7 @@
 
 
 from enum import Enum
+from functools import cached_property
 from typing import Any, Dict, List
 
 from pydantic import BaseModel
@@ -22,11 +23,16 @@ class ProjectionField(BaseModel):
     id: str
     type: str
 
-    @property
+    @cached_property
     def name(self) -> str:
         """Return field name that omits stream reference"""
         return self.id.split(".")[-1]
 
+    class Config:
+        """Model configuration"""
+
+        keep_untouched = (cached_property,)
+
 
 class LineageProjection(BaseModel):
     """Field projection metadata container"""
@@ -72,7 +78,7 @@ class QueryResponse(BaseModel):
     query: str
     response_time: int
 
-    @property
+    @cached_property
     def fields(self) -> List[ProjectionField]:
         """Return the fields from the query response metadata
 
@@ -84,3 +90,4 @@ class Config:
         """Model configuration"""
 
         alias_generator = to_camel
+        keep_untouched = (cached_property,)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "crma-api-client"
-version = "0.3.0"
+version = "0.4.0"
 description = "CRM Analytics REST API Client"
 authors = ["Jonathan Drake <[email protected]>"]
 license = "BSD-3-Clause"

tests/functional/test_query.py

@@ -15,18 +15,18 @@ async def test_query(client: CRMAAPIClient):
         [
             f"""q = load "{version.dataset.id}/{version.id}";""",
             """q = group q by 'Category';""",
-            """q = foreach q generate q.'Category' as 'Category', sum(q.'Sales') as 'Sales';""",
-            """q = order q by 'Category' asc;""",
+            """q = foreach q generate q.'Category' as 'Jon\\'s Category', sum(q.'Sales') as 'Sales';""",
+            """q = order q by 'Jon\\'s Category' asc;""",
         ]
     )
     response = await client.query(query)
     assert response.results.records == [
-        {"Category": "Furniture", "Sales": 741999.7953},
-        {"Category": "Office Supplies", "Sales": 719047.032},
-        {"Category": "Technology", "Sales": 836154.033},
+        {"Jon's Category": "Furniture", "Sales": 741999.7953},
+        {"Jon's Category": "Office Supplies", "Sales": 719047.032},
+        {"Jon's Category": "Technology", "Sales": 836154.033},
     ]
     assert response.fields == [
-        ProjectionField(id="q.Category", type="string"),
+        ProjectionField(id="q.Jon's Category", type="string"),
         ProjectionField(id="q.Sales", type="numeric"),
     ]
-    assert response.fields[0].name == "Category"
+    assert response.fields[0].name == "Jon's Category"