Merge remote-tracking branch 'origin/develop' into quex.actually_wtf_…

…tests

.github/workflows/build-installers.yaml

@@ -318,11 +318,11 @@ jobs:
           echo "Array being passed is ${APPS_ARRAY}"
           echo "APPLICATIONS=${APPS_ARRAY}" >> $GITHUB_OUTPUT
 
-      - name: Gets JWT Token from GitHub
-        uses: Chia-Network/actions/github/jwt@main
-
       - name: Trigger apt repo update
-        run: |
-          curl -s -XPOST -H "Authorization: Bearer ${{ env.JWT_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/start
-          curl -s -XPOST -H "Authorization: Bearer ${{ env.JWT_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/success/deploy
         if: startsWith(github.ref, 'refs/tags/')
+        uses: Chia-Network/actions/github/glue@main
+        with:
+          json_data: '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"available"}'
+          glue_url: ${{ secrets.GLUE_API_URL }}
+          glue_project: "climate-tokenization"
+          glue_path: "trigger"

app/api/v1/activities.py

@@ -15,16 +15,16 @@
 
 router = APIRouter()
 
-
 @router.get("/", response_model=schemas.ActivitiesResponse)
 @disallow([ExecutionMode.REGISTRY, ExecutionMode.CLIENT])
 async def get_activity(
     search: Optional[str] = None,
     search_by: Optional[schemas.ActivitySearchBy] = None,
-    minHeight: Optional[int] = None,
+    min_height: Optional[int] = None,
     mode: Optional[GatewayMode] = None,
     page: int = 1,
     limit: int = 10,
+    org_uid: Optional[str] = None,
     sort: str = "desc",
     db: Session = Depends(deps.get_db_session),
 ) -> schemas.ActivitiesResponse:
@@ -55,8 +55,11 @@ async def get_activity(
         case _:
             raise ErrorCode().bad_request_error(message="search_by is invalid")
 
-    if minHeight is not None:
-        activity_filters["and"].append(models.Activity.height >= minHeight)
+    if min_height is not None:
+        activity_filters["and"].append(models.Activity.height >= min_height)
+
+    if org_uid is not None:
+        cw_filters["orgUid"] = org_uid
 
     climate_data = crud.ClimateWareHouseCrud(
         url=settings.CADT_API_SERVER_HOST,
@@ -123,3 +126,88 @@ async def get_activity(
         activities_with_cw.append(activity_with_cw)
 
     return schemas.ActivitiesResponse(activities=activities_with_cw, total=total)
+
+
+@router.get("/activity-record", response_model=schemas.ActivityRecordResponse)
+@disallow([ExecutionMode.REGISTRY, ExecutionMode.CLIENT])
+async def get_activity_by_cw_unit_id(
+        cw_unit_id: str,
+        coin_id: str,
+        action_mode: str,
+        db: Session = Depends(deps.get_db_session),
+) -> schemas.ActivityRecordResponse:
+    """Get a single activity based on the unit's unitWarehouseId.
+
+    This endpoint is to be called by the explorer.
+    """
+
+    db_crud = crud.DBCrud(db=db)
+
+
+    # fetch unit and related data from CADT
+    cw_filters: Dict[str, str] = {"warehouseUnitId": cw_unit_id}
+
+    climate_data = crud.ClimateWareHouseCrud(
+        url=settings.CADT_API_SERVER_HOST,
+        api_key=settings.CADT_API_KEY,
+    ).combine_climate_units_and_metadata(search=cw_filters)
+    if len(climate_data) == 0:
+        logger.warning(f"Failed to retrieve unit from climate warehouse. search:{cw_filters}")
+        return schemas.ActivityRecordResponse()
+
+    unit_with_metadata = climate_data[0]
+
+    # set filters to fetch activity data related to specified unit
+    activity_filters: Dict[str, Any] = {"or": [], "and": []}
+    if unit_with_metadata["marketplaceIdentifier"]:
+        activity_filters["and"].append(models.Activity.asset_id == unit_with_metadata["marketplaceIdentifier"])
+    else:
+        logger.warning(f"retrieved unit does not contain marketplace identifier. unable to get activity record")
+        return schemas.ActivityRecordResponse()
+
+    activity_filters["and"].append(models.Activity.mode == action_mode)
+    activity_filters["and"].append(models.Activity.coin_id == coin_id)
+
+    activities: [models.Activity]
+    total: int
+
+    # fetch activities with filters, 'total' var ignored
+    (activities, total) = db_crud.select_activity_with_pagination(
+        model=models.Activity,
+        filters=activity_filters,
+        order_by=[models.Activity.height.asc()],
+    )
+    if len(activities) == 0:
+        logger.warning(f"No data to get from activities. filters:{activity_filters}")
+        return schemas.ActivityRecordResponse()
+
+    try:
+        activity = next((activity for activity in activities if activity.coin_id == coin_id and activity.mode == action_mode), None)
+        if activity is None:
+            return schemas.ActivityRecordResponse()
+    except:
+        logger.warning(f"an exception occurred while processing activity record")
+        return schemas.ActivityRecordResponse()
+
+    unit_with_metadata = unit_with_metadata.copy()
+    token = unit_with_metadata.pop("token", None)
+    org = unit_with_metadata.pop("organization", None)
+    project = unit_with_metadata.pop("project", None)
+
+    try:
+        token_on_chain = schemas.TokenOnChain.parse_obj(token)
+        print("instantiated TokenOnChain with parse_obj", flush=True)
+    except ValidationError:
+        print("failed to instantiate TokenOnChain with parse_obj", flush=True)
+        raise
+
+    activity_with_cw = schemas.ActivityWithCW(
+        token=token_on_chain,
+        cw_unit=unit_with_metadata,
+        cw_org=org,
+        cw_project=project,
+        metadata=activity.metadata_,
+        **jsonable_encoder(activity),
+    )
+
+    return schemas.ActivityRecordResponse(activity=activity_with_cw)

app/api/v1/core.py

@@ -4,7 +4,7 @@
 
 from fastapi import APIRouter
 
-from app.api.v1 import activities, cron, keys, tokens, transactions
+from app.api.v1 import activities, cron, keys, tokens, transactions, organizations
 
 router = APIRouter(
     prefix="/v1",
@@ -41,3 +41,8 @@ async def get_info() -> Dict[str, str]:
     prefix="/keys",
     tags=["keys"],
 )
+router.include_router(
+    organizations.router,
+    prefix="/organizations",
+    tags=["organizations"],
+)

app/api/v1/organizations.py

@@ -0,0 +1,20 @@
+from typing import Any
+
+from fastapi import APIRouter
+from fastapi.params import Depends
+
+from app import crud
+from app.config import ExecutionMode, settings
+from app.utils import disallow
+
+router = APIRouter()
+
+# pass through resource to expose organization data from cadt
+@router.get("/", response_model=Any)
+@disallow([ExecutionMode.REGISTRY, ExecutionMode.CLIENT])
+async def get_organizations() -> Any:
+    all_organizations = crud.ClimateWareHouseCrud(
+        url=settings.CADT_API_SERVER_HOST,
+        api_key=settings.CADT_API_KEY,
+    ).get_climate_organizations()
+    return all_organizations

app/crud/chia.py

@@ -57,16 +57,29 @@ def _get_paginated_data(self, path: str, search_params: Dict[str, Any]) -> List[
                 encoded_params = urlencode(params)
 
                 # Construct the URL
-                url = urlparse(f"{self.url}{path}?{encoded_params}")
+                url_obj = urlparse(f"{self.url}{path}?{encoded_params}")
+                url = url_obj.geturl()
 
-                response = requests.get(url.geturl(), headers=self._headers())
+                response = requests.get(url, headers=self._headers())
                 if response.status_code != requests.codes.ok:
                     logger.error(f"Request Url: {response.url} Error Message: {response.text}")
                     raise error_code.internal_server_error(message="API Call Failure")
 
                 data = response.json()
-
-                all_data.extend(data["data"])  # Add data from the current page
+                if data is None:
+                    # some cadt endpoints return null with no pagination info if no data is found
+                    # to prevent an infinite loop need to assume that there is no data matching the search from this iteration on
+                    return all_data
+
+                try:
+                    if data["page"] and (data["pageCount"] >= 0) and len(data["data"]) >= 0: # page count can be 0 (as of when this was written)
+                        all_data.extend(data["data"]) # Add data from the current page
+                    else:
+                        all_data.append(data) # data was not paginated, append and return
+                        return all_data
+                except:
+                    all_data.append(data)  # data was not paginated, append and return
+                    return all_data
 
                 if page >= data["pageCount"]:
                     break  # Exit loop if all pages have been processed
@@ -179,7 +192,7 @@ def combine_climate_units_and_metadata(self, search: Dict[str, Any]) -> List[Dic
                 warehouse_project_id = unit["issuance"]["warehouseProjectId"]
                 project = project_by_id[warehouse_project_id]
             except (KeyError, TypeError):
-                logger.warning(f"Can not get project by warehouse_project_id: {warehouse_project_id}")
+                logger.warning(f"Can not get project by warehouse_project_id")
                 continue
 
             org_metadata = metadata_by_id.get(unit_org_uid)

app/crud/db.py

@@ -63,14 +63,21 @@ def select_first_db(self, model: Any, order_by: Any) -> Any:
             raise errorcode.internal_server_error(message="Select DB Failure")
 
     def select_activity_with_pagination(
-        self, model: Any, filters: Any, order_by: Any, limit: int, page: int
+            self, model: Any, filters: Any, order_by: Any, limit: int = None, page: int = None
     ) -> Tuple[Any, int]:
         try:
             query = self.db.query(model).filter(or_(*filters["or"]), and_(*filters["and"]))
-            return (
-                (query.order_by(*order_by).limit(limit).offset((page - 1) * limit).all()),
-                query.count(),
-            )
+
+            if limit is not None and page is not None:
+                return (
+                    (query.order_by(*order_by).limit(limit).offset((page - 1) * limit).all()),
+                    query.count(),
+                )
+            else:
+                return (
+                    (query.order_by(*order_by).all()),
+                    query.count(),
+                )
         except Exception as e:
             logger.error(f"Select DB Failure:{e}")
             raise errorcode.internal_server_error(message="Select DB Failure")

app/schemas/__init__.py

@@ -6,6 +6,7 @@
     ActivityBase,
     ActivitySearchBy,
     ActivityWithCW,
+    ActivityRecordResponse
 )
 from app.schemas.key import Key  # noqa: F401
 from app.schemas.metadata import (  # noqa: F401

app/schemas/activity.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import enum
+from email.policy import default
 from typing import Any, Dict, List, Optional, Union
 
 from pydantic import Field, validator
@@ -44,6 +45,7 @@ class Activity(ActivityBase):
     vintage_year: int
     sequence_num: int
     asset_id: bytes
+    coin_id: bytes
 
 
 class ActivityWithCW(ActivityBase):
@@ -57,3 +59,6 @@ class ActivityWithCW(ActivityBase):
 class ActivitiesResponse(BaseModel):
     activities: List[ActivityWithCW] = Field(default_factory=list)
     total: int = 0
+
+class ActivityRecordResponse(BaseModel):
+    activity: ActivityWithCW = Field(default=None)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Chia Climate Token Driver"
-version = "1.0.39"
+version = "1.0.40"
 description = "https://github.com/Chia-Network/climate-token-driver"
 authors = [
     "Harry Hsu <[email protected]>",