mcm-cli 1.4.1__tar.gz → 1.4.2__tar.gz

{mcm_cli-1.4.1/mcm_cli.egg-info → mcm_cli-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mcm-cli
-Version: 1.4.1
+Version: 1.4.2
 Summary: A command-line interface for Moloco Commerde Media
 Home-page: https://github.com/moloco-mcm/mcm-cli
 Author: Moloco MCM Team

{mcm_cli-1.4.1 → mcm_cli-1.4.2/mcm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mcm-cli
-Version: 1.4.1
+Version: 1.4.2
 Summary: A command-line interface for Moloco Commerde Media
 Home-page: https://github.com/moloco-mcm/mcm-cli
 Author: Moloco MCM Team

{mcm_cli-1.4.1 → mcm_cli-1.4.2}/mcmcli/__main__.py

@@ -37,7 +37,7 @@ def version():
 	"""
 	Show the tool version
 	"""
-	typer.echo(f"Version: mcm-cli v1.4.1")
+	typer.echo(f"Version: mcm-cli v1.4.2")
 
 app.add_typer(mcmcli.command.account.app, name="account", help="Ad account management")
 app.add_typer(mcmcli.command.admin.app, name="admin", help="Platform administration")

{mcm_cli-1.4.1 → mcm_cli-1.4.2}/mcmcli/command/admin.py

@@ -68,7 +68,7 @@ def list_all_campaigns(
         print(error, file=sys.stderr, flush=True)
         return
 
-    print("Account IDAccount Title,Campaign ID,Campaign Title,Ad Type,Start,End,Budget Period,Budget Amount,Enabling State,State,Created At,Updated At,Item IDs")
+    print("Account ID,Account Title,Campaign ID,Campaign Title,Ad Type,Start,End,Budget Period,Budget Amount,Enabling State,State,Created At,Updated At")
     for account_campaign in account_campaigns:
         a, c = account_campaign
 
@@ -78,7 +78,8 @@ def list_all_campaigns(
         print(f'"{c.budget.period}","{int(c.budget.amount.amount_micro) / 1000000}",', end="", flush=True)
         print(f'"{c.enabling_state}","{c.state}",', end="", flush=True)
         print(f'"{c.created_at}","{c.updated_at}",', end="", flush=True)
-        print(f'"{";".join(c.catalog_item_ids)}"')
+        # print(f'"{";".join(c.catalog_item_ids)}"')
+        print("", flush=True)
 
 @app.command()
 def list_platform_users(
@@ -404,8 +405,6 @@ class AdminCommand:
         for id in accounts:
             account = accounts[id]
             echo('.')
-            if account.state_info.state == "INACTIVE":
-                continue
             # print(f'{account.id}, \"{account.title}\"')
             _, error, campaigns = cc.list_campaigns(account.id)
             if error:

{mcm_cli-1.4.1 → mcm_cli-1.4.2}/mcmcli/data/campaign.py

@@ -41,6 +41,23 @@ class Goal(BaseModel):
     optimize_fixed_cpc: Optional[TargetCpc] = None
     optimize_roas: Optional[TargetRoas] = None
 
+class TargetingEvent(BaseModel):
+    event_type: str
+    matching_param: Optional[str] = None
+    negative: bool
+    matching_date: Optional[str] = None
+
+class AudienceSetting(BaseModel):
+    event_based: Optional[list[TargetingEvent]] = None
+    label: Optional[str] = None
+    event_based_include_list: Optional[list[str]] = None
+    event_based_exclude_list: Optional[list[str]] = None
+
+class Targeting(BaseModel):
+    campaign_targeting_placement_type: str
+    placement_setting: Optional[str]
+    audience_setting: Optional[AudienceSetting]
+
 class Campaign(BaseModel):
     id: str
     title: str
@@ -52,7 +69,7 @@ class Campaign(BaseModel):
     schedule: Schedule
     daily_budget: MicroPrice
     budget: Budget
-    targeting: Optional[str]
+    targeting: Optional[Targeting]
     managed_setting: Optional[str]
     text_entry: str
     goal: Goal

{mcm_cli-1.4.1 → mcm_cli-1.4.2}/setup.py

@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mcm-cli',
-    version='1.4.1',
+    version='1.4.2',
     description='A command-line interface for Moloco Commerde Media',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',