Merge pull request #888 from airtai/dev

4 PRs

.github/workflows/pipeline.yml

@@ -95,7 +95,7 @@ jobs:
               run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
 
             - name: Log in to the Container registry
-              uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
         args: []#[--ignore-words=.codespell-whitelist.txt]
         exclude: |
             (?x)^(
-                docs/overrides/home.html
+                google_ads/language_codes.csv
             )$
 
 -   repo: local

captn/google_ads/client.py

@@ -4,6 +4,7 @@
 
 from pydantic import BaseModel
 from requests import get as requests_get
+from requests import post as requests_post
 
 BASE_URL = environ.get("CAPTN_BACKEND_URL", "http://localhost:9000")
 ALREADY_AUTHENTICATED = "User is already authenticated"
@@ -291,20 +292,18 @@ def check_for_client_approval(
     return NOT_APPROVED
 
 
-def google_ads_create_update(
+def _check_for_approval_and_get_login_url(
     user_id: int,
     conv_id: int,
-    ad: BaseModel,
+    model: BaseModel,
     recommended_modifications_and_answer_list: List[
         Tuple[Dict[str, Any], Optional[str]]
     ],
-    login_customer_id: Optional[str] = None,
-    endpoint: str = "/update-ad-group-ad",
-    already_checked_clients_approval: bool = False,
-) -> Union[Dict[str, Any], str]:
+    already_checked_clients_approval: bool,
+) -> Optional[Dict[str, str]]:
     if not already_checked_clients_approval:
         error_msg = check_for_client_approval(
-            modification_function_parameters=ad.model_dump(),
+            modification_function_parameters=model.model_dump(),
             recommended_modifications_and_answer_list=recommended_modifications_and_answer_list,
         )
         if error_msg:
@@ -314,6 +313,30 @@ def google_ads_create_update(
     if not login_url_response.get("login_url") == ALREADY_AUTHENTICATED:
         return login_url_response
 
+    return None
+
+
+def google_ads_create_update(
+    user_id: int,
+    conv_id: int,
+    ad: BaseModel,
+    recommended_modifications_and_answer_list: List[
+        Tuple[Dict[str, Any], Optional[str]]
+    ],
+    login_customer_id: Optional[str] = None,
+    endpoint: str = "/update-ad-group-ad",
+    already_checked_clients_approval: bool = False,
+) -> Union[Dict[str, Any], str]:
+    login_url_response = _check_for_approval_and_get_login_url(
+        user_id=user_id,
+        conv_id=conv_id,
+        model=ad,
+        recommended_modifications_and_answer_list=recommended_modifications_and_answer_list,
+        already_checked_clients_approval=already_checked_clients_approval,
+    )
+    if login_url_response:
+        return login_url_response
+
     params: Dict[str, Any] = ad.model_dump()
     params["user_id"] = user_id
     params["login_customer_id"] = login_customer_id
@@ -324,3 +347,40 @@ def google_ads_create_update(
 
     response_dict: Union[Dict[str, Any], str] = response.json()
     return response_dict
+
+
+def google_ads_create_assets(
+    user_id: int,
+    conv_id: int,
+    model: BaseModel,
+    recommended_modifications_and_answer_list: List[
+        Tuple[Dict[str, Any], Optional[str]]
+    ],
+    endpoint: str,
+    already_checked_clients_approval: bool = False,
+) -> Union[Dict[str, Any], str]:
+    login_url_response = _check_for_approval_and_get_login_url(
+        user_id=user_id,
+        conv_id=conv_id,
+        model=model,
+        recommended_modifications_and_answer_list=recommended_modifications_and_answer_list,
+        already_checked_clients_approval=already_checked_clients_approval,
+    )
+    if login_url_response:
+        return login_url_response
+
+    params = {
+        "user_id": user_id,
+    }
+
+    body = model.model_dump()
+
+    response = requests_post(
+        f"{BASE_URL}{endpoint}", json=body, params=params, timeout=60
+    )
+
+    if not response.ok:
+        raise ValueError(response.content)
+
+    response_dict: Union[Dict[str, Any], str] = response.json()
+    return response_dict