💥 lunchable 1.0.0

README.md

@@ -14,7 +14,7 @@
 [![GitHub License](https://img.shields.io/github/license/juftin/lunchable?color=blue&label=License)](https://github.com/juftin/lunchable/blob/main/LICENSE)
 
 **lunchable** is a Python Client for the [Lunch Money Developer API](https://lunchmoney.dev). It's
-built on top of [pydantic](https://github.com/samuelcolvin/pydantic), it offers an _intuitive_ API,
+built on top of [pydantic](https://github.com/pydantic/pydantic), it offers an _intuitive_ API,
 a _simple_ CLI, complete coverage of all endpoints, and _plugins_ to other external services.
 
 ### Installation
@@ -35,7 +35,7 @@ lunch = LunchMoney(access_token="xxxxxxxxxxx")
 transactions: List[TransactionObject] = lunch.get_transactions()
 
 first_transaction: TransactionObject = transactions[0]
-transaction_as_dict: Dict[str, Any] = first_transaction.dict()
+transaction_as_dict: Dict[str, Any] = first_transaction.model_dump()
 ```
 
 ```shell

docs/source/index.rst

@@ -45,7 +45,7 @@ and *plugins* to other external services
     transactions: List[TransactionObject] = lunch.get_transactions()
 
     first_transaction: TransactionObject = transactions[0]
-    transaction_as_dict: Dict[str, Any] = first_transaction.dict()
+    transaction_as_dict: Dict[str, Any] = first_transaction.model_dump()
 
 .. code-block:: console
 

lunchable/_cli.py

@@ -9,8 +9,8 @@
 from typing import Any, Dict, Optional, Union
 
 import click
-import requests
-from pydantic.json import pydantic_encoder
+import httpx
+from pydantic_core import to_jsonable_python
 from rich import print, print_json, traceback
 
 import lunchable
@@ -145,7 +145,8 @@ def lunchmoney_transactions(
     """
     lunch = LunchMoney(access_token=context.access_token)
     transactions = lunch.get_transactions(**kwargs)  # type: ignore[arg-type]
-    print_json(data=transactions, default=pydantic_encoder)
+    json_data = to_jsonable_python(transactions)
+    print_json(data=json_data)
 
 
 @plugins.group()
@@ -198,7 +199,8 @@ def splitlunch_expenses(**kwargs: Union[int, str, bool]) -> None:
     if set(kwargs.values()) == {None}:
         kwargs["limit"] = 5
     expenses = splitlunch.get_expenses(**kwargs)  # type: ignore[arg-type]
-    print_json(data=expenses, default=pydantic_encoder)
+    json_data = to_jsonable_python(expenses)
+    print_json(data=json_data)
 
 
 tag_transactions = click.option(
@@ -237,7 +239,8 @@ def make_splitlunch(**kwargs: Union[int, str, bool]) -> None:
 
     splitlunch = SplitLunch()
     results = splitlunch.make_splitlunch(**kwargs)  # type: ignore[arg-type]
-    print_json(data=results, default=pydantic_encoder)
+    json_data = to_jsonable_python(results)
+    print_json(data=json_data)
 
 
 @splitlunch.command("splitlunch-import")
@@ -264,7 +267,8 @@ def make_splitlunch_import(**kwargs: Union[int, str, bool]) -> None:
         financial_partner_group_id=financial_partner_group_id,
     )
     results = splitlunch.make_splitlunch_import(**kwargs)  # type: ignore[arg-type]
-    print_json(data=results, default=pydantic_encoder)
+    json_data = to_jsonable_python(results)
+    print_json(data=json_data)
 
 
 @splitlunch.command("splitlunch-direct-import")
@@ -291,7 +295,8 @@ def make_splitlunch_direct_import(**kwargs: Union[int, str, bool]) -> None:
         financial_partner_group_id=financial_partner_group_id,
     )
     results = splitlunch.make_splitlunch_direct_import(**kwargs)  # type: ignore[arg-type]
-    print_json(data=results, default=pydantic_encoder)
+    json_data = to_jsonable_python(results)
+    print_json(data=json_data)
 
 
 @splitlunch.command("update-balance")
@@ -303,7 +308,8 @@ def update_splitwise_balance() -> None:
 
     splitlunch = SplitLunch()
     updated_asset = splitlunch.update_splitwise_balance()
-    print_json(data=updated_asset, default=pydantic_encoder)
+    json_data = to_jsonable_python(updated_asset)
+    print_json(data=json_data)
 
 
 @splitlunch.command("refresh")
@@ -341,7 +347,8 @@ def refresh_splitwise_transactions(
         allow_self_paid=allow_self_paid,
         allow_payments=allow_payments,
     )
-    print_json(data=response, default=pydantic_encoder)
+    json_data = to_jsonable_python(response)
+    print_json(data=json_data)
 
 
 @plugins.group()
@@ -397,22 +404,23 @@ def http(context: LunchMoneyContext, url: str, request: str, data: str) -> None:
         url_request = f"https://dev.lunchmoney.app/{url}"
     else:
         url_request = url
-    resp = lunch.make_http_request(
+    resp = lunch.request(
         method=request,
         url=url_request,
-        data=data,
+        content=data,
     )
     try:
         resp.raise_for_status()
-    except requests.HTTPError:
+    except httpx.HTTPError:
         logger.error(resp)
         print(resp.text)
         sys.exit(1)
     try:
         response = resp.json()
     except JSONDecodeError:
         response = resp.text
-    print_json(data=response, default=pydantic_encoder)
+    json_data = to_jsonable_python(response)
+    print_json(data=json_data)
 
 
 @plugins.group()

lunchable/_config/logging_config.py

@@ -7,6 +7,7 @@
 from typing import Optional, Tuple, Union
 
 import click
+from rich.console import Console
 from rich.logging import RichHandler
 
 LOG_HANDLER = getenv("LOG_HANDLER", "rich").lower()
@@ -36,7 +37,11 @@ def get_log_handler(
         omit_repeated_times=False,
         show_path=False,
         tracebacks_suppress=[click],
+        console=Console(stderr=True),
     )
+    httpx_logger = logging.getLogger("httpx")
+    if log_level != logging.DEBUG:
+        httpx_logger.setLevel(logging.WARNING)
     python_handler = logging.StreamHandler()
     python_formatter = logging.Formatter("%(asctime)s [%(levelname)8s]: %(message)s")
     python_handler.setFormatter(python_formatter)

lunchable/_version.py

@@ -5,4 +5,4 @@
 __author__ = "Justin Flannery"
 __email__ = "juftin@juftin.com"
 __application__ = "lunchable"
-__version__ = "0.10.0"
+__version__ = "1.0.0b3"

lunchable/exceptions.py

@@ -2,7 +2,7 @@
 Lunchmoney Exceptions
 """
 
-from requests.exceptions import HTTPError
+from httpx import HTTPError
 
 
 class LunchMoneyError(Exception):