Antonyjin upgrade pydantic version

pyproject.toml

@@ -33,16 +33,16 @@ dynamic = [ "version" ]
 dependencies = [
   "aiodns==3.2",
   "aiohttp==3.10.6",
-  "aleph-message>=0.5",
-  "aleph-sdk-python>=1.2,<2",
-  "base58==2.1.1",               # Needed now as default with _load_account changement
-  "py-sr25519-bindings==0.2",    # Needed for DOT signatures
+  "aleph-message @ git+https://github.com/aleph-im/aleph-message@108-upgrade-pydantic-version#egg=aleph-message",          # Change the version after the release
+  "aleph-sdk-python @ git+https://github.com/aleph-im/aleph-sdk-python@177-upgrade-pydantic-version#egg=aleph-sdk-python", # Change the version after the release
+  "base58==2.1.1",                                                                                                         # Needed now as default with _load_account changement
+  "py-sr25519-bindings==0.2",                                                                                              # Needed for DOT signatures
   "pygments==2.18",
-  "pynacl==1.5",                 # Needed now as default with _load_account changement
+  "pynacl==1.5",                                                                                                           # Needed now as default with _load_account changement
   "python-magic==0.4.27",
   "rich==13.9.3",
   "setuptools>=65.5",
-  "substrate-interface==1.7.11", # Needed for DOT signatures
+  "substrate-interface==1.7.11",                                                                                           # Needed for DOT signatures
   "textual==0.73",
   "typer==0.12.5",
 ]
@@ -83,7 +83,7 @@ dependencies = [
   "pytest-cov==5.0.0",
   "mypy==1.10.0",
   "base58==2.1.1",
-  "fastapi==0.98.0",
+  "fastapi==0.100.0",
   "httpx==0.27.0",
   "types-requests==2.32.0.20240602",
   "types-setuptools==70.0.0.20240524",
@@ -99,7 +99,7 @@ dependencies = [
   "pytest-cov==5.0.0",
   "mypy==1.10.0",
   "base58==2.1.1",
-  "fastapi==0.98.0",
+  "fastapi==0.100.0",
   "httpx==0.27.0",
 ]
 [tool.hatch.envs.testing.scripts]
@@ -122,7 +122,7 @@ dependencies = [
   "mypy==1.10.0",
   "ruff==0.4.9",
   "isort==5.13.2",
-  "yamlfix==1.16.1",
+  "yamlfix==1.17.0",
   "pyproject-fmt==2.2.1",
 
   "types-requests==2.32.0.20240602",

src/aleph_client/commands/account.py

@@ -235,7 +235,7 @@ def sign_bytes(
 
     coroutine = account.sign_raw(message.encode())
     signature = asyncio.run(coroutine)
-    typer.echo("\nSignature: " + signature.hex())
+    typer.echo("\nSignature: " + f"0x{signature.hex()}")
 
 
 @app.command()

src/aleph_client/commands/aggregate.py

@@ -81,7 +81,7 @@
             inline=inline,
             address=address,
         )
-        log_message = json.dumps(message.dict(), indent=4, default=extended_json_encoder)
+        log_message = json.dumps(message.model_dump(), indent=4, default=extended_json_encoder)
         typer.echo(log_message)
 
 

src/aleph_client/commands/files.py

@@ -52,7 +52,7 @@
             ref=ref,
         )
         logger.debug("Upload finished")
-        typer.echo(f"{result.json(indent=4)}")
+        typer.echo(f"{result.model_dump_json(indent=4)}")
 
 
 @app.command()
@@ -91,7 +91,7 @@
                 ref=ref,
             )
             logger.debug("Upload finished")
-            typer.echo(f"{result.json(indent=4)}")
+            typer.echo(f"{result.model_dump_json(indent=4)}")
 
 
 @app.command()
@@ -142,7 +142,7 @@
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         value = await client.forget(hashes=[ItemHash(item_hash)], reason=reason, channel=channel)
-        typer.echo(f"{value[0].json(indent=4)}")
+        typer.echo(f"{value[0].model_dump_json(indent=4)}")
 
 
 class GetAccountFilesQueryParams(BaseModel):
@@ -229,7 +229,7 @@
 
         uri = f"{settings.API_HOST}/api/v0/addresses/{address}/files"
         async with aiohttp.ClientSession() as session:
-            response = await session.get(uri, params=query_params.dict())
+            response = await session.get(uri, params=query_params.model_dump())
             if response.status == 200:
                 files_data = await response.json()
                 formatted_files_data = json_lib.dumps(files_data, indent=4)

src/aleph_client/commands/instance/__init__.py

@@ -407,7 +407,7 @@
             )
             raise typer.Exit(code=1)
         if print_messages:
-            echo(f"{message.json(indent=4)}")
+            echo(f"{message.model_dump_json(indent=4)}")
 
         item_hash: ItemHash = message.item_hash
         item_hash_text = Text(item_hash, style="bright_cyan")
@@ -584,7 +584,7 @@
 
         message, status = await client.forget(hashes=[ItemHash(item_hash)], reason=reason)
         if print_message:
-            echo(f"{message.json(indent=4)}")
+            echo(f"{message.model_dump_json(indent=4)}")
         echo(f"Instance {item_hash} has been deleted.")
 
 
@@ -761,7 +761,7 @@
             echo(f"Address: {address}\n\nNo instance found\n")
             raise typer.Exit(code=1)
         if json:
-            echo(messages.json(indent=4))
+            echo(messages.model_dump_json(indent=4))
         else:
             # Since we filtered on message type, we can safely cast as InstanceMessage.
             messages = cast(List[InstanceMessage], messages)

src/aleph_client/commands/instance/network.py

@@ -11,7 +11,7 @@
 from aleph_message.models import InstanceMessage
 from aleph_message.models.execution.base import PaymentType
 from aleph_message.models.item_hash import ItemHash
-from pydantic import ValidationError
+from pydantic import ValidationError, field_validator
 
 from aleph_client.commands import help_strings
 from aleph_client.commands.node import NodeInfo, _fetch_nodes
@@ -49,7 +49,7 @@ async def fetch_crn_info(node_url: str) -> dict | None:
             async with session.get(url) as resp:
                 resp.raise_for_status()
                 system: dict = await resp.json()
-                info["machine_usage"] = MachineUsage.parse_obj(system)
+                info["machine_usage"] = MachineUsage.model_validate(system)
             return info
     except aiohttp.InvalidURL as e:
         logger.debug(f"Invalid CRN URL: {url}: {e}")

src/aleph_client/commands/message.py

@@ -7,6 +7,7 @@
 import sys
 import tempfile
 import time
+from datetime import datetime
 from pathlib import Path
 from typing import Dict, List, Optional
 
@@ -18,7 +19,7 @@
 from aleph.sdk.query.responses import MessagesResponse
 from aleph.sdk.types import AccountFromPrivateKey, StorageEnum
 from aleph.sdk.utils import extended_json_encoder
-from aleph_message.models import AlephMessage, ProgramMessage
+from aleph_message.models import AlephMessage, ProgramMessage, StoreMessage
 from aleph_message.models.base import MessageType
 from aleph_message.models.item_hash import ItemHash
 from aleph_message.status import MessageStatus
@@ -46,9 +47,9 @@
         typer.echo(f"Message Status: {colorized_status(status)}")
         if status == MessageStatus.REJECTED:
             reason = await client.get_message_error(item_hash=ItemHash(item_hash))
-            typer.echo(colorful_json(json.dumps(reason, indent=4)))
+            typer.echo(colorful_json(json.dumps(reason, indent=4, default=extended_json_encoder)))
         else:
-            typer.echo(colorful_message_json(message))
+            typer.echo(colorful_json(json.dumps(message, indent=4, default=extended_json_encoder)))
 
 
 @app.command()
@@ -102,7 +103,9 @@
             ),
             ignore_invalid_messages=ignore_invalid_messages,
         )
-    typer.echo(colorful_json(response.json(sort_keys=True, indent=4)))
+    typer.echo(
+        colorful_json(json.dumps(response.model_dump(), sort_keys=True, indent=4, default=extended_json_encoder))
+    )
 
 
 @app.command()
@@ -156,7 +159,7 @@
             storage_engine=storage_engine,
         )
 
-        typer.echo(json.dumps(result.dict(), indent=4, default=extended_json_encoder))
+        typer.echo(json.dumps(result.model_dump(), indent=4, default=extended_json_encoder))
 
 
 @app.command()
@@ -178,7 +181,7 @@
     editor: str = os.getenv("EDITOR", default="nano")
     with tempfile.NamedTemporaryFile(suffix="json") as fd:
         # Fill in message template
-        fd.write(existing_message.content.json(indent=4).encode())
+        fd.write(existing_message.content.model_dump_json(indent=4).encode())
         fd.seek(0)
 
         # Launch editor
@@ -203,11 +206,11 @@
     typer.echo(new_content)
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         message, status, response = await client.submit(
-            content=new_content.dict(),
+            content=new_content.model_dump(),
             message_type=existing_message.type,
             channel=existing_message.channel,
         )
-    typer.echo(f"{message.json(indent=4)}")
+    typer.echo(f"{message.model_dump_json(indent=4)}")
 
 
 @app.command()
@@ -245,7 +248,7 @@
         async for message in client.watch_messages(
             message_filter=MessageFilter(refs=[ref], addresses=[original.content.address])
         ):
-            typer.echo(f"{message.json(indent=indent)}")
+            typer.echo(f"{message.model_dump_json(indent=indent)}")
 
 
 @app.command()

src/aleph_client/commands/program.py

@@ -124,7 +124,7 @@
             )
             logger.debug("Upload finished")
             if print_messages or print_code_message:
-                typer.echo(f"{user_code.json(indent=4)}")
+                typer.echo(f"{user_code.model_dump_json(indent=4)}")
             program_ref = user_code.item_hash
 
         # Register the program
@@ -144,7 +144,7 @@
         )
         logger.debug("Upload finished")
         if print_messages or print_program_message:
-            typer.echo(f"{message.json(indent=4)}")
+            typer.echo(f"{message.model_dump_json(indent=4)}")
 
         item_hash: ItemHash = message.item_hash
         hash_base32 = b32encode(b16decode(item_hash.upper())).strip(b"=").lower().decode()
@@ -212,7 +212,7 @@
             )
             logger.debug("Upload finished")
             if print_message:
-                typer.echo(f"{message.json(indent=4)}")
+                typer.echo(f"{message.model_dump_json(indent=4)}")
 
 
 @app.command()
@@ -240,7 +240,7 @@
             message_type=message.type,
             channel=message.channel,
         )
-        typer.echo(f"{message.json(indent=4)}")
+        typer.echo(f"{message.model_dump_json(indent=4)}")
 
 
 @app.command()

src/aleph_client/commands/utils.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import json
 import logging
 import os
 import sys
@@ -50,7 +51,7 @@
 
 def colorful_message_json(message: GenericMessage):
     """Render a message in JSON with colors."""
-    return colorful_json(message.json(sort_keys=True, indent=4))
+    return colorful_json(json.dumps(message.model_dump(), sort_keys=True, indent=4))
 
 
 def input_multiline() -> str:

tests/test_post.json

@@ -1 +1,4 @@
-{"hello": "world"}
+{
+    "type": "POST",
+    "hello": "world"
+}